diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
index 39fff66bc94529cfce8a2cfd1c8c38160ee9c931..fe2c97163c5b0fb1a8b7cfcdbdddd339477062b1 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -56,8 +56,8 @@
       "rate": 1000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-admin",
+      "switch_port": "Ethernet21",
       "vendor": "Intel"
     },
     {
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 75c78fbc78e4447ca288b2a6450d7e30c89ba5b5..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": "sw-core-adm",
+      "switch": "sw-core",
       "switch_port": "Ethernet6",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core-adm",
+      "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 b8b594091813bd5c13b5a3bca9df994b27c2a923..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": "sw-core-adm",
+      "switch": "sw-core",
       "switch_port": "Ethernet33",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core-adm",
+      "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 43e1c2c145a631998d2f838727e83a680c5c5f47..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": "sw-core-adm",
+      "switch": "sw-core",
       "switch_port": "Ethernet9",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core-adm",
+      "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 e17cb231cd66dab645bbd057c24f6c9b144445b1..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": "sw-core-adm",
+      "switch": "sw-core",
       "switch_port": "Ethernet12",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core-adm",
+      "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 6a5dae6c9742d0f551fc7bd99cae0aeacc32560c..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": "sw-core-adm",
+      "switch": "sw-core",
       "switch_port": "Ethernet15",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core-adm",
+      "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 80176cd200073f5c222a219240ea43384bb3d9a3..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": "sw-core-adm",
+      "switch": "sw-core",
       "switch_port": "Ethernet18",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core-adm",
+      "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 da869aeb64c3e0e13b27eab1b2e39a7ee2f9ab8a..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": "sw-core-adm",
+      "switch": "sw-core",
       "switch_port": "Ethernet21",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core-adm",
+      "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 791708d98e4fcbb5f7da7003f8abb27888a8092f..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": "sw-core-adm",
+      "switch": "sw-core",
       "switch_port": "Ethernet24",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core-adm",
+      "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 e1150407f16a1e316886f38f81e59e726377e88d..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": "sw-core-adm",
+      "switch": "sw-core",
       "switch_port": "Ethernet27",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core-adm",
+      "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 01059d3cb1eece932ad6db7296faa62d4fa3751d..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": "sw-core-adm",
+      "switch": "sw-core",
       "switch_port": "Ethernet30",
       "vendor": "Intel"
     },
@@ -171,7 +171,7 @@
       "rate": 25000000000,
       "sriov": true,
       "sriov_totalvfs": 64,
-      "switch": "sw-core-adm",
+      "switch": "sw-core",
       "switch_port": "Ethernet32",
       "vendor": "Intel"
     },
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..2adf8ce2c04c5b4fa45cfbecc3e068294d3576aa
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
@@ -0,0 +1,247 @@
+{
+  "ip": "172.16.175.253",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+          "kind": "node",
+          "port": "data",
+          "snmp_name": "Ethernet0",
+          "uid": "srv"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet1",
+          "uid": "pve-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet2",
+          "uid": "pve-2"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet3",
+          "uid": "fleckenstein-1"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet4",
+          "uid": "fleckenstein-2"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet5",
+          "uid": "fleckenstein-3"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet6",
+          "uid": "fleckenstein-4"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet7",
+          "uid": "fleckenstein-5"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet8",
+          "uid": "fleckenstein-6"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet9",
+          "uid": "fleckenstein-7"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet10",
+          "uid": "fleckenstein-8"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet11",
+          "uid": "fleckenstein-9"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet12",
+          "uid": "fleckenstein-10"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet13",
+          "uid": "engelbourg-2"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet14",
+          "uid": "engelbourg-3"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet15",
+          "uid": "engelbourg-4"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet16",
+          "uid": "engelbourg-5"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet17",
+          "uid": "engelbourg-6"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet18",
+          "uid": "engelbourg-7"
+        },
+        {
+          "kind": "node",
+          "port": "bmc",
+          "snmp_name": "Ethernet19",
+          "uid": "engelbourg-8"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet20",
+          "uid": "ramstein-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet21",
+          "uid": "engelbourg-1"
+        },
+        {
+          "kind": "node",
+          "port": "devstrasbourg-bmc",
+          "snmp_name": "Ethernet22",
+          "uid": "iotlab"
+        },
+        {
+          "kind": "node",
+          "port": "devaportnet-bmc",
+          "snmp_name": "Ethernet23",
+          "uid": "inetlab"
+        },
+        {
+          "kind": "node",
+          "port": "stonet-bmc",
+          "snmp_name": "Ethernet24",
+          "uid": "inetlab"
+        },
+        {
+          "kind": "node",
+          "port": "ibat-bmc",
+          "snmp_name": "Ethernet25",
+          "uid": "inetlab"
+        },
+        {
+          "kind": "node",
+          "port": "wikinet-bmc",
+          "snmp_name": "Ethernet26",
+          "uid": "inetlab"
+        },
+        {
+          "kind": "node",
+          "port": "soknet-bmc",
+          "snmp_name": "Ethernet27",
+          "uid": "inetlab"
+        },
+        {
+          "kind": "node",
+          "port": "strasbourg-bmc",
+          "snmp_name": "Ethernet28",
+          "uid": "iotlab"
+        },
+        {
+          "kind": "node",
+          "port": "devwww-bmc",
+          "snmp_name": "Ethernet29",
+          "uid": "iotlab"
+        },
+        {
+          "kind": "node",
+          "port": "www-bmc",
+          "snmp_name": "Ethernet30",
+          "uid": "iotlab"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "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..f7e9479217caea3a7c6f92a4a3ec775fe938bda9
--- /dev/null
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
@@ -0,0 +1,465 @@
+{
+  "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": "node",
+          "port": "sw1-eth0",
+          "snmp_name": "Ethernet4",
+          "uid": "inetlab"
+        },
+        {
+          "kind": "node",
+          "port": "sw1-eth1",
+          "snmp_name": "Ethernet5",
+          "uid": "inetlab"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet6",
+          "uid": "fleckenstein-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth1",
+          "snmp_name": "Ethernet7",
+          "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": "eth1",
+          "snmp_name": "Ethernet10",
+          "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": "eth1",
+          "snmp_name": "Ethernet13",
+          "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": "eth1",
+          "snmp_name": "Ethernet16",
+          "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": "eth1",
+          "snmp_name": "Ethernet19",
+          "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": "eth1",
+          "snmp_name": "Ethernet22",
+          "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": "eth1",
+          "snmp_name": "Ethernet25",
+          "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": "eth1",
+          "snmp_name": "Ethernet28",
+          "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": "eth1",
+          "snmp_name": "Ethernet31",
+          "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": "eth1",
+          "snmp_name": "Ethernet34",
+          "uid": "fleckenstein-10"
+        },
+        {
+          "kind": "node",
+          "port": "eth2",
+          "snmp_name": "Ethernet35",
+          "uid": "fleckenstein-10"
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "Ethernet36",
+          "uid": "sw-admin"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "Ethernet40",
+          "uid": "ramstein-1"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "Ethernet44",
+          "uid": "engelbourg-2"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "Ethernet56",
+          "uid": "engelbourg-3"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "Ethernet68",
+          "uid": "engelbourg-4"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "Ethernet80",
+          "uid": "engelbourg-5"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "Ethernet92",
+          "uid": "engelbourg-6"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "Ethernet104",
+          "uid": "engelbourg-7"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "Ethernet116",
+          "uid": "engelbourg-8"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        }
+      ],
+      "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/sites/strasbourg/networks/sw-admin.yaml b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7164b511f918878574d3b8502a14c8ebfb2fa958
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/networks/sw-admin.yaml
@@ -0,0 +1,49 @@
+---
+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: node
+      ports:
+        0: srv-data
+        1: pve-1
+        2: pve-2
+        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: engelbourg-2-bmc
+        14: engelbourg-3-bmc 
+        15: engelbourg-4-bmc 
+        16: engelbourg-5-bmc 
+        17: engelbourg-6-bmc 
+        18: engelbourg-7-bmc 
+        19: engelbourg-8-bmc 
+        20: ramstein-1
+        21: engelbourg-1
+        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
+        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..82e22b7af235948cf565e90930ce44babad72268
--- /dev/null
+++ b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
@@ -0,0 +1,109 @@
+---
+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: inetlab-sw1-eth1
+        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: 
+          uid: engelbourg-2-eth0
+          rate: 1000000000
+        48: 
+        52: 
+        56: 
+          uid: engelbourg-3-eth0
+          rate: 1000000000
+        60: 
+        64: 
+        68: 
+          uid: engelbourg-4-eth0
+          rate: 1000000000
+        72: 
+        76: 
+        80: 
+          uid: engelbourg-5-eth0
+          rate: 1000000000
+        84: 
+        88:
+        92: 
+          uid: engelbourg-6-eth0
+          rate: 1000000000
+        96: 
+        100: 
+        104: 
+          uid: engelbourg-7-eth0
+          rate: 1000000000
+        108: 
+        112: 
+        116:
+          uid: engelbourg-8-eth0
+          rate: 1000000000
+        120: 
+        124: 
+  channels:
+    port-channel1:
+      port: port-channel1
+      uid: srv-data
+      rate: 50000000000
+      kind: server
+