diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.json
index 746370ed4b4fce712e6b2d795a73616c5c54ef11..32812b8149869305fa90632ef65d436fca025a16 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.json
@@ -502,7 +502,7 @@
   ],
   "model": "HPE Proliant DL360 Gen10+",
   "nodes_count": 10,
-  "nodes_description": "2 CPUs Intel Xeon Silver 4314, 16 cores/CPU, 512GB RAM, 894GB SSD, 3x2235GB HDD, 2 x 25Gb Ethernet",
+  "nodes_description": "2 CPUs Intel Xeon Silver 4314, 16 cores/CPU, 512GB RAM, 894GB SSD, 3x2235GB HDD, 1 x 25Gb Ethernet, 1 x 100Gb Ethernet",
   "priority": 202212,
   "queues": [
     "admin",
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 29b815353e502cedd8d047fc2b7c6be35f6e0b52..74a9f17ea9827f857699da0b4db164c4ee0045a5 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
@@ -155,24 +155,19 @@
     {
       "device": "eth2",
       "driver": "ice",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "4.30 0x8001af35 1.3429.0",
       "interface": "Ethernet",
-      "ip": "172.16.160.21",
-      "ip6": "2001:660:4406:a00:1:1:0:1",
       "kavlan": false,
       "mac": "6c:fe:54:47:1a:84",
       "management": false,
       "model": "Ethernet Controller E810-C for SFP",
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "name": "ens1f0",
-      "network_address": "fleckenstein-1-eth2.strasbourg.grid5000.fr",
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core",
-      "switch_port": "Ethernet8",
       "vendor": "Intel"
     },
     {
@@ -230,18 +225,24 @@
     {
       "device": "eth6",
       "driver": "mlx5_core",
-      "enabled": false,
+      "enabled": true,
       "firmware_version": "22.36.1010 (MT_0000000437)",
       "interface": "Ethernet",
+      "ip": "172.16.160.61",
+      "ip6": "2001:660:4406:a00:1:1:0:1",
       "kavlan": false,
       "mac": "88:e9:a4:d4:d7:a0",
       "management": false,
       "model": "MT2892 Family [ConnectX-6 Dx]",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "ens2f0np0",
+      "network_address": "fleckenstein-1-eth6.strasbourg.grid5000.fr",
+      "rate": 100000000000,
       "sriov": true,
       "sriov_totalvfs": 8,
+      "switch": "sw-core",
+      "switch_port": "Ethernet16",
       "vendor": "Mellanox Technologies"
     },
     {
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 ab52ddcfc09462b44655371b29657acbf83d9159..9289e54496a0c36e10bcaceeb9653528e16929fc 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
@@ -132,7 +132,7 @@
       "sriov": true,
       "sriov_totalvfs": 128,
       "switch": "sw-core",
-      "switch_port": "Ethernet33",
+      "switch_port": "Ethernet15",
       "vendor": "Intel"
     },
     {
@@ -155,24 +155,19 @@
     {
       "device": "eth2",
       "driver": "ice",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "4.30 0x8001af35 1.3429.0",
       "interface": "Ethernet",
-      "ip": "172.16.160.30",
-      "ip6": "2001:660:4406:a00:1:1:0:a",
       "kavlan": false,
       "mac": "6c:fe:54:47:1a:3c",
       "management": false,
       "model": "Ethernet Controller E810-C for SFP",
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "name": "ens1f0",
-      "network_address": "fleckenstein-10-eth2.strasbourg.grid5000.fr",
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core",
-      "switch_port": "Ethernet35",
       "vendor": "Intel"
     },
     {
@@ -230,18 +225,24 @@
     {
       "device": "eth6",
       "driver": "mlx5_core",
-      "enabled": false,
+      "enabled": true,
       "firmware_version": "22.36.1010 (MT_0000000437)",
       "interface": "Ethernet",
+      "ip": "172.16.160.70",
+      "ip6": "2001:660:4406:a00:1:1:0:a",
       "kavlan": false,
       "mac": "88:e9:a4:d4:d7:8c",
       "management": false,
       "model": "MT2892 Family [ConnectX-6 Dx]",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "ens2f0np0",
+      "network_address": "fleckenstein-10-eth6.strasbourg.grid5000.fr",
+      "rate": 100000000000,
       "sriov": true,
       "sriov_totalvfs": 8,
+      "switch": "sw-core",
+      "switch_port": "Ethernet52",
       "vendor": "Mellanox Technologies"
     },
     {
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 26007adafad19900d68eb0d340ccc7fcfe65614e..7ca18c1260de63a7cad1dacdc35e68781314ffe0 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
@@ -132,7 +132,7 @@
       "sriov": true,
       "sriov_totalvfs": 128,
       "switch": "sw-core",
-      "switch_port": "Ethernet9",
+      "switch_port": "Ethernet7",
       "vendor": "Intel"
     },
     {
@@ -155,24 +155,19 @@
     {
       "device": "eth2",
       "driver": "ice",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "4.30 0x8001af35 1.3429.0",
       "interface": "Ethernet",
-      "ip": "172.16.160.22",
-      "ip6": "2001:660:4406:a00:1:1:0:2",
       "kavlan": false,
       "mac": "6c:fe:54:47:2f:48",
       "management": false,
       "model": "Ethernet Controller E810-C for SFP",
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "name": "ens1f0",
-      "network_address": "fleckenstein-2-eth2.strasbourg.grid5000.fr",
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core",
-      "switch_port": "Ethernet11",
       "vendor": "Intel"
     },
     {
@@ -230,18 +225,24 @@
     {
       "device": "eth6",
       "driver": "mlx5_core",
-      "enabled": false,
+      "enabled": true,
       "firmware_version": "22.32.2004 (MT_0000000437)",
       "interface": "Ethernet",
+      "ip": "172.16.160.62",
+      "ip6": "2001:660:4406:a00:1:1:0:2",
       "kavlan": false,
       "mac": "88:e9:a4:71:19:48",
       "management": false,
       "model": "MT2892 Family [ConnectX-6 Dx]",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "ens2f0np0",
+      "network_address": "fleckenstein-2-eth6.strasbourg.grid5000.fr",
+      "rate": 100000000000,
       "sriov": true,
       "sriov_totalvfs": 8,
+      "switch": "sw-core",
+      "switch_port": "Ethernet20",
       "vendor": "Mellanox Technologies"
     },
     {
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 0754b4f09835d5bdc64910afc982eafcd713a244..0ffceebfca976edd08c21e7fd7b52f40b836c8a6 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
@@ -132,7 +132,7 @@
       "sriov": true,
       "sriov_totalvfs": 128,
       "switch": "sw-core",
-      "switch_port": "Ethernet12",
+      "switch_port": "Ethernet8",
       "vendor": "Intel"
     },
     {
@@ -155,24 +155,19 @@
     {
       "device": "eth2",
       "driver": "ice",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "4.30 0x8001af35 1.3429.0",
       "interface": "Ethernet",
-      "ip": "172.16.160.23",
-      "ip6": "2001:660:4406:a00:1:1:0:3",
       "kavlan": false,
       "mac": "6c:fe:54:47:2f:c0",
       "management": false,
       "model": "Ethernet Controller E810-C for SFP",
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "name": "ens1f0",
-      "network_address": "fleckenstein-3-eth2.strasbourg.grid5000.fr",
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core",
-      "switch_port": "Ethernet14",
       "vendor": "Intel"
     },
     {
@@ -230,18 +225,24 @@
     {
       "device": "eth6",
       "driver": "mlx5_core",
-      "enabled": false,
+      "enabled": true,
       "firmware_version": "22.36.1010 (MT_0000000437)",
       "interface": "Ethernet",
+      "ip": "172.16.160.63",
+      "ip6": "2001:660:4406:a00:1:1:0:3",
       "kavlan": false,
       "mac": "88:e9:a4:d4:e7:44",
       "management": false,
       "model": "MT2892 Family [ConnectX-6 Dx]",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "ens2f0np0",
+      "network_address": "fleckenstein-3-eth6.strasbourg.grid5000.fr",
+      "rate": 100000000000,
       "sriov": true,
       "sriov_totalvfs": 8,
+      "switch": "sw-core",
+      "switch_port": "Ethernet24",
       "vendor": "Mellanox Technologies"
     },
     {
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 878601d08e8da3fc845ea2249958dbdaeed5d7f4..37c65579d0d0498a2ba99697536165927edfea86 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
@@ -132,7 +132,7 @@
       "sriov": true,
       "sriov_totalvfs": 128,
       "switch": "sw-core",
-      "switch_port": "Ethernet15",
+      "switch_port": "Ethernet9",
       "vendor": "Intel"
     },
     {
@@ -155,24 +155,19 @@
     {
       "device": "eth2",
       "driver": "ice",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "3.20 0x80012765 1.3189.0",
       "interface": "Ethernet",
-      "ip": "172.16.160.24",
-      "ip6": "2001:660:4406:a00:1:1:0:4",
       "kavlan": false,
       "mac": "6c:fe:54:47:2f:d4",
       "management": false,
       "model": "Ethernet Controller E810-C for SFP",
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "name": "ens1f0",
-      "network_address": "fleckenstein-4-eth2.strasbourg.grid5000.fr",
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core",
-      "switch_port": "Ethernet17",
       "vendor": "Intel"
     },
     {
@@ -230,18 +225,24 @@
     {
       "device": "eth6",
       "driver": "mlx5_core",
-      "enabled": false,
+      "enabled": true,
       "firmware_version": "22.36.1010 (MT_0000000437)",
       "interface": "Ethernet",
+      "ip": "172.16.160.64",
+      "ip6": "2001:660:4406:a00:1:1:0:4",
       "kavlan": false,
       "mac": "88:e9:a4:d4:d7:68",
       "management": false,
       "model": "MT2892 Family [ConnectX-6 Dx]",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "ens2f0np0",
+      "network_address": "fleckenstein-4-eth6.strasbourg.grid5000.fr",
+      "rate": 100000000000,
       "sriov": true,
       "sriov_totalvfs": 8,
+      "switch": "sw-core",
+      "switch_port": "Ethernet28",
       "vendor": "Mellanox Technologies"
     },
     {
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 a478f83f2ee94e704bb8be115818efb177c4ff88..01654b08cb2fadaed5e68017f96caf3680d93b36 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
@@ -132,7 +132,7 @@
       "sriov": true,
       "sriov_totalvfs": 128,
       "switch": "sw-core",
-      "switch_port": "Ethernet18",
+      "switch_port": "Ethernet10",
       "vendor": "Intel"
     },
     {
@@ -155,24 +155,19 @@
     {
       "device": "eth2",
       "driver": "ice",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "4.30 0x8001af35 1.3429.0",
       "interface": "Ethernet",
-      "ip": "172.16.160.25",
-      "ip6": "2001:660:4406:a00:1:1:0:5",
       "kavlan": false,
       "mac": "6c:fe:54:47:2f:f4",
       "management": false,
       "model": "Ethernet Controller E810-C for SFP",
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "name": "ens1f0",
-      "network_address": "fleckenstein-5-eth2.strasbourg.grid5000.fr",
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core",
-      "switch_port": "Ethernet20",
       "vendor": "Intel"
     },
     {
@@ -230,18 +225,24 @@
     {
       "device": "eth6",
       "driver": "mlx5_core",
-      "enabled": false,
+      "enabled": true,
       "firmware_version": "22.36.1010 (MT_0000000437)",
       "interface": "Ethernet",
+      "ip": "172.16.160.65",
+      "ip6": "2001:660:4406:a00:1:1:0:5",
       "kavlan": false,
       "mac": "88:e9:a4:d4:d7:a4",
       "management": false,
       "model": "MT2892 Family [ConnectX-6 Dx]",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "ens2f0np0",
+      "network_address": "fleckenstein-5-eth6.strasbourg.grid5000.fr",
+      "rate": 100000000000,
       "sriov": true,
       "sriov_totalvfs": 8,
+      "switch": "sw-core",
+      "switch_port": "Ethernet32",
       "vendor": "Mellanox Technologies"
     },
     {
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 5709591f577a872724f7cebae3af500b15553b28..2791809cb69867dd8f774df8980475b7a9ce0085 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
@@ -132,7 +132,7 @@
       "sriov": true,
       "sriov_totalvfs": 128,
       "switch": "sw-core",
-      "switch_port": "Ethernet21",
+      "switch_port": "Ethernet11",
       "vendor": "Intel"
     },
     {
@@ -155,24 +155,19 @@
     {
       "device": "eth2",
       "driver": "ice",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "4.30 0x8001af35 1.3429.0",
       "interface": "Ethernet",
-      "ip": "172.16.160.26",
-      "ip6": "2001:660:4406:a00:1:1:0:6",
       "kavlan": false,
       "mac": "6c:fe:54:47:2f:d8",
       "management": false,
       "model": "Ethernet Controller E810-C for SFP",
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "name": "ens1f0",
-      "network_address": "fleckenstein-6-eth2.strasbourg.grid5000.fr",
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core",
-      "switch_port": "Ethernet23",
       "vendor": "Intel"
     },
     {
@@ -230,18 +225,24 @@
     {
       "device": "eth6",
       "driver": "mlx5_core",
-      "enabled": false,
+      "enabled": true,
       "firmware_version": "22.36.1010 (MT_0000000437)",
       "interface": "Ethernet",
+      "ip": "172.16.160.66",
+      "ip6": "2001:660:4406:a00:1:1:0:6",
       "kavlan": false,
       "mac": "88:e9:a4:d4:e7:50",
       "management": false,
       "model": "MT2892 Family [ConnectX-6 Dx]",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "ens2f0np0",
+      "network_address": "fleckenstein-6-eth6.strasbourg.grid5000.fr",
+      "rate": 100000000000,
       "sriov": true,
       "sriov_totalvfs": 8,
+      "switch": "sw-core",
+      "switch_port": "Ethernet36",
       "vendor": "Mellanox Technologies"
     },
     {
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 9c907ab7b34fe694e74a8483d93e3bb04a933c2e..f6d29662932ce883dc2b50adec5c482c1071d44b 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
@@ -132,7 +132,7 @@
       "sriov": true,
       "sriov_totalvfs": 128,
       "switch": "sw-core",
-      "switch_port": "Ethernet24",
+      "switch_port": "Ethernet12",
       "vendor": "Intel"
     },
     {
@@ -155,24 +155,19 @@
     {
       "device": "eth2",
       "driver": "ice",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "4.30 0x8001af35 1.3429.0",
       "interface": "Ethernet",
-      "ip": "172.16.160.27",
-      "ip6": "2001:660:4406:a00:1:1:0:7",
       "kavlan": false,
       "mac": "6c:fe:54:47:28:38",
       "management": false,
       "model": "Ethernet Controller E810-C for SFP",
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "name": "ens1f0",
-      "network_address": "fleckenstein-7-eth2.strasbourg.grid5000.fr",
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core",
-      "switch_port": "Ethernet26",
       "vendor": "Intel"
     },
     {
@@ -230,18 +225,24 @@
     {
       "device": "eth6",
       "driver": "mlx5_core",
-      "enabled": false,
+      "enabled": true,
       "firmware_version": "22.36.1010 (MT_0000000437)",
       "interface": "Ethernet",
+      "ip": "172.16.160.67",
+      "ip6": "2001:660:4406:a00:1:1:0:7",
       "kavlan": false,
       "mac": "88:e9:a4:d4:e7:6c",
       "management": false,
       "model": "MT2892 Family [ConnectX-6 Dx]",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "ens2f0np0",
+      "network_address": "fleckenstein-7-eth6.strasbourg.grid5000.fr",
+      "rate": 100000000000,
       "sriov": true,
       "sriov_totalvfs": 8,
+      "switch": "sw-core",
+      "switch_port": "Ethernet40",
       "vendor": "Mellanox Technologies"
     },
     {
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 a024a407a271c147e4f43e0b42d1ca484562f17e..5f8a08b1795224a87d40589168d58db85b183faf 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
@@ -132,7 +132,7 @@
       "sriov": true,
       "sriov_totalvfs": 128,
       "switch": "sw-core",
-      "switch_port": "Ethernet27",
+      "switch_port": "Ethernet13",
       "vendor": "Intel"
     },
     {
@@ -155,24 +155,19 @@
     {
       "device": "eth2",
       "driver": "ice",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "4.30 0x8001af35 1.3429.0",
       "interface": "Ethernet",
-      "ip": "172.16.160.28",
-      "ip6": "2001:660:4406:a00:1:1:0:8",
       "kavlan": false,
       "mac": "6c:fe:54:47:26:9c",
       "management": false,
       "model": "Ethernet Controller E810-C for SFP",
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "name": "ens1f0",
-      "network_address": "fleckenstein-8-eth2.strasbourg.grid5000.fr",
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core",
-      "switch_port": "Ethernet29",
       "vendor": "Intel"
     },
     {
@@ -230,18 +225,24 @@
     {
       "device": "eth6",
       "driver": "mlx5_core",
-      "enabled": false,
+      "enabled": true,
       "firmware_version": "22.36.1010 (MT_0000000437)",
       "interface": "Ethernet",
+      "ip": "172.16.160.68",
+      "ip6": "2001:660:4406:a00:1:1:0:8",
       "kavlan": false,
       "mac": "88:e9:a4:d4:d7:a8",
       "management": false,
       "model": "MT2892 Family [ConnectX-6 Dx]",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "ens2f0np0",
+      "network_address": "fleckenstein-8-eth6.strasbourg.grid5000.fr",
+      "rate": 100000000000,
       "sriov": true,
       "sriov_totalvfs": 8,
+      "switch": "sw-core",
+      "switch_port": "Ethernet44",
       "vendor": "Mellanox Technologies"
     },
     {
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 ad24ec09b8c4ec98cecc48970aa085564fae44fb..0fb55d8c29684cc4850d68dba0d35678016bbfb6 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
@@ -132,7 +132,7 @@
       "sriov": true,
       "sriov_totalvfs": 128,
       "switch": "sw-core",
-      "switch_port": "Ethernet30",
+      "switch_port": "Ethernet14",
       "vendor": "Intel"
     },
     {
@@ -155,24 +155,19 @@
     {
       "device": "eth2",
       "driver": "ice",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "4.30 0x8001af35 1.3429.0",
       "interface": "Ethernet",
-      "ip": "172.16.160.29",
-      "ip6": "2001:660:4406:a00:1:1:0:9",
       "kavlan": false,
       "mac": "6c:fe:54:47:22:34",
       "management": false,
       "model": "Ethernet Controller E810-C for SFP",
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "name": "ens1f0",
-      "network_address": "fleckenstein-9-eth2.strasbourg.grid5000.fr",
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core",
-      "switch_port": "Ethernet32",
       "vendor": "Intel"
     },
     {
@@ -230,18 +225,24 @@
     {
       "device": "eth6",
       "driver": "mlx5_core",
-      "enabled": false,
+      "enabled": true,
       "firmware_version": "22.36.1010 (MT_0000000437)",
       "interface": "Ethernet",
+      "ip": "172.16.160.69",
+      "ip6": "2001:660:4406:a00:1:1:0:9",
       "kavlan": false,
       "mac": "88:e9:a4:d4:e7:e8",
       "management": false,
       "model": "MT2892 Family [ConnectX-6 Dx]",
-      "mountable": false,
+      "mountable": true,
       "mounted": false,
       "name": "ens2f0np0",
+      "network_address": "fleckenstein-9-eth6.strasbourg.grid5000.fr",
+      "rate": 100000000000,
       "sriov": true,
       "sriov_totalvfs": 8,
+      "switch": "sw-core",
+      "switch_port": "Ethernet48",
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
index bdcd3a5225ec6043d335e538d7c83dcd76c2d371..ba4781cfd37f69e7ebca1a460ca2a4b3276f01bf 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
@@ -1,10 +1,12 @@
 {
+  "backplane_bps": 1080000000000,
   "ip": "172.16.175.253",
   "kind": "switch",
   "linecards": [
     {
     },
     {
+      "backplane_bps": 1080000000000,
       "kavlan_pattern": "%PORT%",
       "kind": "other",
       "ports": [
@@ -207,6 +209,7 @@
         },
         {
           "kind": "switch",
+          "rate": 100000000000,
           "snmp_name": "Ethernet48",
           "uid": "sw-core"
         }
@@ -216,7 +219,7 @@
     }
   ],
   "managed_by_us": true,
-  "model": "unknown",
+  "model": "EdgeCore AS5835-54T",
   "site": "strasbourg",
   "snmp_community": "Unknown",
   "type": "network_equipment",
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
index 74e56737e89e4695bf1a3e182a3ec2e965cb0e78..cde1d57e7e394a94bedf23183073e38c3e86c033 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
@@ -2,6 +2,7 @@
   "alias": [
     "engelbourg-1"
   ],
+  "backplane_bps": 6400000000000,
   "channels": {
     "port-channel1": {
       "kind": "server",
@@ -16,26 +17,31 @@
     {
     },
     {
+      "backplane_bps": 6400000000000,
       "kavlan_pattern": "%PORT%",
       "kind": "node",
       "ports": [
         {
           "kind": "channel",
+          "rate": 25000000000,
           "snmp_name": "Ethernet0",
           "uid": "port-channel1"
         },
         {
           "kind": "channel",
+          "rate": 25000000000,
           "snmp_name": "Ethernet1",
           "uid": "port-channel1"
         },
         {
           "kind": "server",
+          "rate": 25000000000,
           "snmp_name": "Ethernet2",
           "uid": "pve-1"
         },
         {
           "kind": "server",
+          "rate": 25000000000,
           "snmp_name": "Ethernet3",
           "uid": "pve-2"
         },
@@ -43,153 +49,145 @@
         },
         {
           "kind": "router",
+          "rate": 10000000000,
           "snmp_name": "Ethernet5",
           "uid": "gw"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "rate": 25000000000,
           "snmp_name": "Ethernet6",
           "uid": "fleckenstein-1"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 25000000000,
+          "snmp_name": "Ethernet7",
+          "uid": "fleckenstein-2"
         },
         {
           "kind": "node",
-          "port": "eth2",
+          "port": "eth0",
+          "rate": 25000000000,
           "snmp_name": "Ethernet8",
-          "uid": "fleckenstein-1"
+          "uid": "fleckenstein-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "rate": 25000000000,
           "snmp_name": "Ethernet9",
-          "uid": "fleckenstein-2"
+          "uid": "fleckenstein-4"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 25000000000,
+          "snmp_name": "Ethernet10",
+          "uid": "fleckenstein-5"
         },
         {
           "kind": "node",
-          "port": "eth2",
+          "port": "eth0",
+          "rate": 25000000000,
           "snmp_name": "Ethernet11",
-          "uid": "fleckenstein-2"
+          "uid": "fleckenstein-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "rate": 25000000000,
           "snmp_name": "Ethernet12",
-          "uid": "fleckenstein-3"
+          "uid": "fleckenstein-7"
         },
         {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 25000000000,
+          "snmp_name": "Ethernet13",
+          "uid": "fleckenstein-8"
         },
         {
           "kind": "node",
-          "port": "eth2",
+          "port": "eth0",
+          "rate": 25000000000,
           "snmp_name": "Ethernet14",
-          "uid": "fleckenstein-3"
+          "uid": "fleckenstein-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "rate": 25000000000,
           "snmp_name": "Ethernet15",
-          "uid": "fleckenstein-4"
+          "uid": "fleckenstein-10"
         },
         {
+          "kind": "node",
+          "port": "eth6",
+          "snmp_name": "Ethernet16",
+          "uid": "fleckenstein-1"
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet17",
-          "uid": "fleckenstein-4"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet18",
-          "uid": "fleckenstein-5"
         },
         {
         },
         {
           "kind": "node",
-          "port": "eth2",
+          "port": "eth6",
           "snmp_name": "Ethernet20",
-          "uid": "fleckenstein-5"
+          "uid": "fleckenstein-2"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet21",
-          "uid": "fleckenstein-6"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet23",
-          "uid": "fleckenstein-6"
         },
         {
           "kind": "node",
-          "port": "eth0",
+          "port": "eth6",
           "snmp_name": "Ethernet24",
-          "uid": "fleckenstein-7"
+          "uid": "fleckenstein-3"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet26",
-          "uid": "fleckenstein-7"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet27",
-          "uid": "fleckenstein-8"
         },
         {
+          "kind": "node",
+          "port": "eth6",
+          "snmp_name": "Ethernet28",
+          "uid": "fleckenstein-4"
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet29",
-          "uid": "fleckenstein-8"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet30",
-          "uid": "fleckenstein-9"
         },
         {
         },
         {
           "kind": "node",
-          "port": "eth2",
+          "port": "eth6",
           "snmp_name": "Ethernet32",
-          "uid": "fleckenstein-9"
+          "uid": "fleckenstein-5"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "Ethernet33",
-          "uid": "fleckenstein-10"
         },
         {
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "snmp_name": "Ethernet35",
-          "uid": "fleckenstein-10"
         },
         {
-          "kind": "switch",
+          "kind": "node",
+          "port": "eth6",
           "snmp_name": "Ethernet36",
-          "uid": "sw-admin"
+          "uid": "fleckenstein-6"
         },
         {
         },
@@ -198,6 +196,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth6",
+          "snmp_name": "Ethernet40",
+          "uid": "fleckenstein-7"
         },
         {
         },
@@ -206,6 +208,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth6",
+          "snmp_name": "Ethernet44",
+          "uid": "fleckenstein-8"
         },
         {
         },
@@ -214,6 +220,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth6",
+          "snmp_name": "Ethernet48",
+          "uid": "fleckenstein-9"
         },
         {
         },
@@ -222,6 +232,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth6",
+          "snmp_name": "Ethernet52",
+          "uid": "fleckenstein-10"
         },
         {
         },
@@ -230,6 +244,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet56",
+          "uid": "engelbourg-2"
         },
         {
         },
@@ -238,6 +256,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet60",
+          "uid": "engelbourg-2"
         },
         {
         },
@@ -246,6 +268,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet64",
+          "uid": "engelbourg-3"
         },
         {
         },
@@ -254,6 +280,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet68",
+          "uid": "engelbourg-3"
         },
         {
         },
@@ -262,6 +292,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet72",
+          "uid": "engelbourg-4"
         },
         {
         },
@@ -270,6 +304,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet76",
+          "uid": "engelbourg-4"
         },
         {
         },
@@ -278,6 +316,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet80",
+          "uid": "engelbourg-5"
         },
         {
         },
@@ -286,6 +328,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet84",
+          "uid": "engelbourg-5"
         },
         {
         },
@@ -294,6 +340,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet88",
+          "uid": "engelbourg-6"
         },
         {
         },
@@ -302,6 +352,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet92",
+          "uid": "engelbourg-6"
         },
         {
         },
@@ -310,6 +364,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet96",
+          "uid": "engelbourg-7"
         },
         {
         },
@@ -318,6 +376,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet100",
+          "uid": "engelbourg-7"
         },
         {
         },
@@ -326,6 +388,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet104",
+          "uid": "engelbourg-8"
         },
         {
         },
@@ -334,6 +400,10 @@
         {
         },
         {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet108",
+          "uid": "engelbourg-8"
         },
         {
         },
@@ -366,14 +436,17 @@
         {
         },
         {
+          "kind": "switch",
+          "snmp_name": "Ethernet124",
+          "uid": "sw-admin"
         }
       ],
-      "rate": 25000000000,
+      "rate": 100000000000,
       "snmp_pattern": "Ethernet%PORT%"
     }
   ],
   "managed_by_us": true,
-  "model": "wedge100bf_32x",
+  "model": "EdgeCore wedge100bf_32x",
   "site": "strasbourg",
   "snmp_community": "Unknown",
   "type": "network_equipment",
diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index a28d0cf9e02bd4f33770a087751d9a488a4a4a28..27f994a7d65bb9f96efe4dfad4939cf4b2d0a702 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -219,7 +219,10 @@ ipv4:
       strasbourg fleckenstein eth0 0 0 0 0
       strasbourg fleckenstein eth1 0 0 0 10
       strasbourg fleckenstein eth2 0 0 0 20
+      strasbourg fleckenstein eth6 0 0 0 60
       strasbourg engelbourg eth0 0 0 1 0
+      strasbourg engelbourg eth1 0 0 1 10
+      strasbourg engelbourg eth2 0 0 1 20
       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/fleckenstein/fleckenstein.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml
index bb38e97a305857f72f0e29150065b9bb7d751422..ee3ad3a7811742c1045a5f511f31f6993ff675ef 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/fleckenstein.yaml
@@ -33,8 +33,8 @@ nodes:
         mountable: false
         mounted: false
       eth2:
-        enabled: true
-        mountable: true
+        enabled: false
+        mountable: false
         mounted: false
       eth3:
         enabled: false
@@ -49,8 +49,8 @@ nodes:
         mountable: false
         mounted: false
       eth6:
-        enabled: false
-        mountable: false
+        enabled: true
+        mountable: true
         mounted: false
       eth7:
         enabled: false
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml
index e19e0cbed441c36d7a5e827e3846786237b05817..976d2a72aba5f70dd62c5134f0f57c06c2fa4165 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.yaml
@@ -150,6 +150,7 @@ fleckenstein-1:
       management: false
       model: MT2892 Family [ConnectX-6 Dx]
       name: ens2f0np0
+      rate: 100000000000
       sriov: true
       sriov_totalvfs: 8
       vendor: Mellanox Technologies
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml
index 0c700cbae7e69ac0ff3605bda8ce3db1e2e15ea6..8eef6058456c9630831c41d0aa38a2216da95092 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.yaml
@@ -150,6 +150,7 @@ fleckenstein-10:
       management: false
       model: MT2892 Family [ConnectX-6 Dx]
       name: ens2f0np0
+      rate: 100000000000
       sriov: true
       sriov_totalvfs: 8
       vendor: Mellanox Technologies
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml
index 8512e81c89eb5b0dbad77b8b8495fbca6e1fa3ef..9259cfad0e44867033976ee72eae181f1779e61c 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.yaml
@@ -150,6 +150,7 @@ fleckenstein-2:
       management: false
       model: MT2892 Family [ConnectX-6 Dx]
       name: ens2f0np0
+      rate: 100000000000
       sriov: true
       sriov_totalvfs: 8
       vendor: Mellanox Technologies
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml
index 552a7a526f95fdb61db7f11d23f0a1e208313474..61dd68400fe9782193f635438eb0933974b92a50 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.yaml
@@ -150,6 +150,7 @@ fleckenstein-3:
       management: false
       model: MT2892 Family [ConnectX-6 Dx]
       name: ens2f0np0
+      rate: 100000000000
       sriov: true
       sriov_totalvfs: 8
       vendor: Mellanox Technologies
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml
index 9c5504d4e4a85163e13b051e009ccaff75888107..1243df3bfd2863f8e288e4d234c3451fea3db1c0 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.yaml
@@ -150,6 +150,7 @@ fleckenstein-4:
       management: false
       model: MT2892 Family [ConnectX-6 Dx]
       name: ens2f0np0
+      rate: 100000000000
       sriov: true
       sriov_totalvfs: 8
       vendor: Mellanox Technologies
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml
index 683e0439b7e6e23bd8061bde00c25609dff2785b..cc523a7cf6918692ecd104813154d0dc2d501ce0 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.yaml
@@ -150,6 +150,7 @@ fleckenstein-5:
       management: false
       model: MT2892 Family [ConnectX-6 Dx]
       name: ens2f0np0
+      rate: 100000000000
       sriov: true
       sriov_totalvfs: 8
       vendor: Mellanox Technologies
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml
index 160bee7700a0d36e0feb391ced8d756232ad331c..ae696c4ead33a3f3a765c8b32e032660f1ba4b27 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.yaml
@@ -150,6 +150,7 @@ fleckenstein-6:
       management: false
       model: MT2892 Family [ConnectX-6 Dx]
       name: ens2f0np0
+      rate: 100000000000
       sriov: true
       sriov_totalvfs: 8
       vendor: Mellanox Technologies
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml
index 9c7f258cb72f808b30a99be5dc58f7d7735dc4f6..de83c687b5cfba4b9a905f39c349ec5bb45e2a76 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.yaml
@@ -150,6 +150,7 @@ fleckenstein-7:
       management: false
       model: MT2892 Family [ConnectX-6 Dx]
       name: ens2f0np0
+      rate: 100000000000
       sriov: true
       sriov_totalvfs: 8
       vendor: Mellanox Technologies
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml
index 0a9c6544d675ab837908d537a08fac7e179e7574..dd18e97b7f04d96cce250de898762332f1b9be65 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.yaml
@@ -150,6 +150,7 @@ fleckenstein-8:
       management: false
       model: MT2892 Family [ConnectX-6 Dx]
       name: ens2f0np0
+      rate: 100000000000
       sriov: true
       sriov_totalvfs: 8
       vendor: Mellanox Technologies
diff --git a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml
index c5a6e2b1f4755f372fbf91ec23bac8176caf86f8..e4472abd14acccbf86661f227c88ca1d74e23b82 100644
--- a/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.yaml
@@ -150,6 +150,7 @@ fleckenstein-9:
       management: false
       model: MT2892 Family [ConnectX-6 Dx]
       name: ens2f0np0
+      rate: 100000000000
       sriov: true
       sriov_totalvfs: 8
       vendor: Mellanox Technologies
diff --git a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
index c8c90a745c9fea2589ca3cc39a135679563e1be7..953fa82b8444c086c39faf15a721a7efbf6698e1 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
@@ -1,14 +1,16 @@
 ---
 sw-admin:
-  model: unknown
+  model: EdgeCore AS5835-54T
   ip: 172.16.175.253
   kind: switch
   managed_by_us: true
   snmp_community: Unknown
   site: strasbourg
+  backplane_bps: 1_080_000_000_000
   linecards:
     1:
-      rate: 1000000000
+      backplane_bps: 1_080_000_000_000
+      rate: 1_000_000_000
       snmp_pattern: "Ethernet%PORT%"
       kavlan_pattern: "%PORT%"
       kind: other
@@ -27,25 +29,25 @@ sw-admin:
         11: fleckenstein-9-bmc 
         12: fleckenstein-10-bmc 
         13: 
-          uid: engelbourg-2
+          uid: engelbourg-2-eth0
           kind: node
         14: 
-          uid: engelbourg-3 
+          uid: engelbourg-3-eth0
           kind: node
         15: 
-          uid: engelbourg-4
+          uid: engelbourg-4-eth0
           kind: node 
         16: 
-          uid: engelbourg-5
+          uid: engelbourg-5-eth0
           kind: node 
         17: 
-          uid: engelbourg-6
+          uid: engelbourg-6-eth0
           kind: node 
         18: 
-          uid: engelbourg-7
+          uid: engelbourg-7-eth0
           kind: node 
         19: 
-          uid: engelbourg-8
+          uid: engelbourg-8-eth0
           kind: node 
         # 20: 
           # uid: ramstein-1
@@ -61,8 +63,9 @@ sw-admin:
         29: iotlab-devwww-bmc
         30: iotlab-www-bmc
         31: 
-          uid: engelbourg-1 # Fake entry
+          uid: engelbourg-1-eth0 # Fake entry
           kind: node
         48: 
           uid: sw-core
           kind: switch
+          rate: 100_000_000_000
diff --git a/input/grid5000/sites/strasbourg/networks/sw-core.yaml b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
index eb9e42d11776e17d045f018091020c335539da44..5abd3fc32e32de6a4a6caab9879218e742901d9b 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-core.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
@@ -1,6 +1,6 @@
 ---
 sw-core:
-  model: wedge100bf_32x
+  model: EdgeCore wedge100bf_32x
   ip: 172.16.175.252
   #TODO
   #ip6: 2001:660:4406:a00::ffff:ffff
@@ -10,9 +10,11 @@ sw-core:
   alias:
     - engelbourg-1
   site: strasbourg
+  backplane_bps: 6_400_000_000_000
   linecards: 
     1:
-      rate: 25000000000
+      backplane_bps: 6_400_000_000_000
+      rate: 100_000_000_000
       snmp_pattern: "Ethernet%PORT%"
       kavlan_pattern: "%PORT%"
       kind: node
@@ -20,79 +22,89 @@ sw-core:
         0:
           uid: port-channel1
           kind: channel
+          rate: 25_000_000_000
         1:
           uid: port-channel1
           kind: channel 
+          rate: 25_000_000_000
         2:
           uid: pve-1
           kind: server
+          rate: 25_000_000_000
         3:
           uid: pve-2
           kind: server
+          rate: 25_000_000_000
 #       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: 
+          rate: 10_000_000_000
+        6:
+          uid: fleckenstein-1-eth0
+          rate: 25_000_000_000
+        7:
+          uid: fleckenstein-2-eth0
+          rate: 25_000_000_000
+        8:
+          uid: fleckenstein-3-eth0
+          rate: 25_000_000_000
+        9:
+          uid: fleckenstein-4-eth0
+          rate: 25_000_000_000
+        10:
+          uid: fleckenstein-5-eth0
+          rate: 25_000_000_000
+        11:
+          uid: fleckenstein-6-eth0
+          rate: 25_000_000_000
+        12:
+          uid: fleckenstein-7-eth0
+          rate: 25_000_000_000
+        13:
+          uid: fleckenstein-8-eth0
+          rate: 25_000_000_000
+        14:
+          uid: fleckenstein-9-eth0
+          rate: 25_000_000_000
+        15:
+          uid: fleckenstein-10-eth0
+          rate: 25_000_000_000
+        16: fleckenstein-1-eth6
+        20: fleckenstein-2-eth6
+        24: fleckenstein-3-eth6
+        28: fleckenstein-4-eth6
+        32: fleckenstein-5-eth6
+        36: fleckenstein-6-eth6
+        40: fleckenstein-7-eth6
+        44: fleckenstein-8-eth6
+        48: fleckenstein-9-eth6
+        52: fleckenstein-10-eth6
+        56: engelbourg-2-eth1
+        60: engelbourg-2-eth2
+        64: engelbourg-3-eth1
+        68: engelbourg-3-eth2
+        72: engelbourg-4-eth1
+        76: engelbourg-4-eth2
+        80: engelbourg-5-eth1
+        84: engelbourg-5-eth2
+        88: engelbourg-6-eth1
+        92: engelbourg-6-eth2 
+        96: engelbourg-7-eth1
+        100: engelbourg-7-eth2 
+        104: engelbourg-8-eth1
+        108: engelbourg-8-eth2
         112: 
         116:
         120: 
         124: 
+          uid: sw-admin
+          kind: switch
 
   channels:
     port-channel1:
       port: port-channel1
       uid: srv-data
-      rate: 50000000000
+      rate: 50_000_000_000
       kind: server