diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
index 6a05ce5071af438b41ae256d55e1e57b6ffbfdb6..1dfa242f1a5f683e63de23ca9468bfeef5caa8a9 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-1.json
@@ -131,8 +131,8 @@
       "rate": 1000000000,
       "sriov": true,
       "sriov_totalvfs": 7,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-3",
+      "switch_port": "1/1/34",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
index 2333e315f3922634f64d6070bae95fc5fba33512..f95526b4512204ffb960ea923fdcd7d68ad6450f 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-2.json
@@ -131,8 +131,8 @@
       "rate": 1000000000,
       "sriov": true,
       "sriov_totalvfs": 7,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-3",
+      "switch_port": "1/1/33",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
index 56631211c594e6dce2f190b066119f3414e25b8d..6f4361b6dd0b751ecf81b622cce3066923570dc4 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-3.json
@@ -131,8 +131,8 @@
       "rate": 1000000000,
       "sriov": true,
       "sriov_totalvfs": 7,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-3",
+      "switch_port": "1/1/13",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
index 7719126b4386332236a6eda712e4c47a93c92f9f..3de7706dc5a259d4260178ae3b97378c8f75196e 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-4.json
@@ -131,8 +131,8 @@
       "rate": 1000000000,
       "sriov": true,
       "sriov_totalvfs": 7,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-3",
+      "switch_port": "1/1/14",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
index 090ed556682185a4bc071a92ad20f5b8e0e062e9..feaad548f20fcb439a368122a95888b80eb4a1af 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-5.json
@@ -131,8 +131,8 @@
       "rate": 1000000000,
       "sriov": true,
       "sriov_totalvfs": 7,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-3",
+      "switch_port": "1/1/36",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
index 1dd5d346fb4dfcbad2b7dcef2b039e60acac701e..38913a8da6b3ce0ce131ed76d19342cc8b91f8e7 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-6.json
@@ -131,8 +131,8 @@
       "rate": 1000000000,
       "sriov": true,
       "sriov_totalvfs": 7,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-3",
+      "switch_port": "1/1/35",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
index 95379a337543cdf2c22895c85f7bdc747bb5975b..3d01c5f739b49bb4989b89c3c77f920b9ac98add 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-7.json
@@ -131,8 +131,8 @@
       "rate": 1000000000,
       "sriov": true,
       "sriov_totalvfs": 7,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-3",
+      "switch_port": "1/1/11",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
index 621916cb05e8d64bde9f660f2fb3ea65ce0b986c..236af42fdc3fbca12d11c45d6d2a498601f56a33 100644
--- a/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
+++ b/data/grid5000/sites/sophia/clusters/mercantour2/nodes/mercantour2-8.json
@@ -131,8 +131,8 @@
       "rate": 1000000000,
       "sriov": true,
       "sriov_totalvfs": 7,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-3",
+      "switch_port": "1/1/12",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
index af6ed71fbe784e73bcbd0bf48c65b9b2ca74c3c0..3df94afc3562f4f2d43204d0fd2f867061771c1b 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-1.json
@@ -168,8 +168,8 @@
       "rate": 25000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-1",
+      "switch_port": "1/1/31",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
index 19c1f5596329ae59e393f03e208ac68c72464c92..1220d781d12a2885202a48ce8071797e3a6c0c27 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-2.json
@@ -168,8 +168,8 @@
       "rate": 25000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-1",
+      "switch_port": "1/1/32",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
index 8aefc2a4fadf08c83d22b669278bd941a623ae49..b48ed359cdd7ebe991d06a6f2e271c9c8cbea4e8 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-3.json
@@ -168,8 +168,8 @@
       "rate": 25000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-1",
+      "switch_port": "1/1/33",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
index c7d8ef7de9f8dccc1accb286e4a7de6fc7a5010e..b67a523d22ce111b7234565373f88446acd4764f 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-4.json
@@ -168,8 +168,8 @@
       "rate": 25000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-1",
+      "switch_port": "1/1/34",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
index 93b435cbd6dfdacb2b00b659fd8695fb94826554..a075db444f080d2a13d0374e4ec164368bef6e4a 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-5.json
@@ -168,8 +168,8 @@
       "rate": 25000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-1",
+      "switch_port": "1/1/35",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
index c5bbe22d161e54156f1d714e684a878b493eebcd..b5ac1184b4ee3f4f0c60a8c2fff8b72ba853b41b 100644
--- a/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
+++ b/data/grid5000/sites/sophia/clusters/musa/nodes/musa-6.json
@@ -168,8 +168,8 @@
       "rate": 25000000000,
       "sriov": false,
       "sriov_totalvfs": 0,
-      "switch": null,
-      "switch_port": null,
+      "switch": "sw-1",
+      "switch_port": "1/1/36",
       "vendor": "Broadcom Inc. and subsidiaries"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
index 9ca74e3076ce5bd8e2afa47dc79c4c9305a0ae5e..888de235851dfb039fa76796fbb167f0129fbabb 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-10.json
@@ -156,8 +156,8 @@
       "rate": 1000000000,
       "sriov": true,
       "sriov_totalvfs": 7,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet9/3",
+      "switch": "sw-3",
+      "switch_port": "1/1/45",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
index 98edc9f14bf80e29d53b7dad6d0343045d4f8082..e8589026ea82c73ee19aee4168e520ed518fc9ce 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-11.json
@@ -156,8 +156,8 @@
       "rate": 1000000000,
       "sriov": true,
       "sriov_totalvfs": 7,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet4/9",
+      "switch": "sw-3",
+      "switch_port": "1/1/1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
index ec66757c1e282380b2cd3f285f40d32b4d283450..807227ee028cc72668012b534f350631c43bddbe 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-12.json
@@ -156,8 +156,8 @@
       "rate": 1000000000,
       "sriov": true,
       "sriov_totalvfs": 7,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet4/1",
+      "switch": "sw-3",
+      "switch_port": "1/1/2",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
index 84e6bc775b62fb13149e196ba0b75afca1a665ec..7a9e4303258acdc8e47c1472b96c7b63cb6328ca 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/nodes/uvb-9.json
@@ -156,8 +156,8 @@
       "rate": 1000000000,
       "sriov": true,
       "sriov_totalvfs": 7,
-      "switch": "gw",
-      "switch_port": "GigabitEthernet9/1",
+      "switch": "sw-3",
+      "switch_port": "1/1/46",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/sophia/clusters/uvb/uvb.json b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
index c4ed25d3c6b30466bbad1122629836b61406a9d4..171094abfdc5b1dc6eda7ca91a6e924e3136a343 100644
--- a/data/grid5000/sites/sophia/clusters/uvb/uvb.json
+++ b/data/grid5000/sites/sophia/clusters/uvb/uvb.json
@@ -48,94 +48,6 @@
         "port": 9100,
         "protocol": "prometheus"
       }
-    },
-    {
-      "description": "Input byte counter for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifacein_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output byte counter for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifaceout_bytes_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Input packet counter for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifacein_packets_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output packet counter for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifaceout_packets_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Input counter of discarded packets for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifacein_packets_discard_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output counter of discarded packets for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifaceout_packets_discard_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Input counter of packet errors for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifacein_packets_error_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
-    },
-    {
-      "description": "Output counter of packet errors for the network device port",
-      "labels": {
-        "interface": "eth0"
-      },
-      "name": "network_ifaceout_packets_error_total",
-      "period": 1000,
-      "source": {
-        "protocol": "network_equipment"
-      }
     }
   ],
   "model": "Dell PowerEdge C6100",
diff --git a/data/grid5000/sites/sophia/network_equipments/gw-ng.json b/data/grid5000/sites/sophia/network_equipments/gw-ng.json
new file mode 100644
index 0000000000000000000000000000000000000000..2002688fee1792678edbe80835bca9272748e585
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/gw-ng.json
@@ -0,0 +1,153 @@
+{
+  "channels": {
+    "lag1": {
+      "kind": "server",
+      "port": "lag1",
+      "rate": 500000000000,
+      "uid": "srv-data1"
+    },
+    "lag2": {
+      "kind": "server",
+      "port": "lag2",
+      "rate": 500000000000,
+      "uid": "srv-data2"
+    },
+    "lag3": {
+      "kind": "server",
+      "port": "lag3",
+      "rate": 500000000000,
+      "uid": "srv-data3"
+    },
+    "lag4": {
+      "kind": "server",
+      "port": "lag4",
+      "rate": 200000000000,
+      "uid": "srv-data4"
+    }
+  },
+  "ip": "172.17.143.253",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "1/1/47",
+          "uid": "sw-3"
+        },
+        {
+          "kind": "router",
+          "snmp_name": "1/1/48",
+          "uid": "gw"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 6300M",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "gw-ng",
+  "warranty": "2048-05"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index 15f5c66e33a43d04362d10f27fb93c96c7bb3f36..d2f1ca59810475552a589349b88b530deea54f69 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -19,12 +19,6 @@
           "kind": "backbone",
           "snmp_name": "10GigabitEthernet1/1",
           "uid": "renater-sophia"
-        },
-        {
-          "kind": "switch",
-          "port": "0/5",
-          "snmp_name": "10GigabitEthernet1/2",
-          "uid": "swx1nef"
         }
       ],
       "rate": 10000000000,
@@ -99,10 +93,6 @@
         {
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet4/1",
-          "uid": "uvb-12"
         },
         {
         },
@@ -119,10 +109,6 @@
         {
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet4/9",
-          "uid": "uvb-11"
         },
         {
         },
@@ -218,10 +204,6 @@
         {
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet9/1",
-          "uid": "uvb-9"
         },
         {
           "kind": "server",
@@ -229,10 +211,24 @@
           "uid": "srv-data"
         },
         {
-          "kind": "node",
-          "port": "eth0",
-          "snmp_name": "GigabitEthernet9/3",
-          "uid": "uvb-10"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "GigabitEthernet9/7",
+          "uid": "gw-ng"
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "GigabitEthernet9/9",
+          "uid": "sw-1"
         }
       ],
       "rate": 1000000000,
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-1.json b/data/grid5000/sites/sophia/network_equipments/sw-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..9f068318a8af27b0f121624eda89651c2e306f19
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/sw-1.json
@@ -0,0 +1,199 @@
+{
+  "backplane_bps": 1440000000000,
+  "channels": {
+    "lag1": {
+      "kind": "server",
+      "port": "lag1",
+      "rate": 500000000000,
+      "uid": "srv-data1"
+    },
+    "lag2": {
+      "kind": "server",
+      "port": "lag2",
+      "rate": 500000000000,
+      "uid": "srv-data2"
+    },
+    "lag3": {
+      "kind": "server",
+      "port": "lag3",
+      "rate": 500000000000,
+      "uid": "srv-data3"
+    },
+    "lag4": {
+      "kind": "server",
+      "port": "lag4",
+      "rate": 200000000000,
+      "uid": "srv-data4"
+    }
+  },
+  "ip": "172.17.143.251",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "channel",
+          "snmp_name": "1/1/3",
+          "uid": "lag1"
+        },
+        {
+          "kind": "channel",
+          "snmp_name": "1/1/4",
+          "uid": "lag1"
+        },
+        {
+          "kind": "channel",
+          "rate": 25000000000,
+          "snmp_name": "1/1/5",
+          "uid": "lag2"
+        },
+        {
+          "kind": "channel",
+          "snmp_name": "1/1/6",
+          "uid": "lag2"
+        },
+        {
+          "kind": "channel",
+          "snmp_name": "1/1/7",
+          "uid": "lag3"
+        },
+        {
+          "kind": "channel",
+          "snmp_name": "1/1/8",
+          "uid": "lag3"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/31",
+          "uid": "musa-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/32",
+          "uid": "musa-2"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/33",
+          "uid": "musa-3"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/34",
+          "uid": "musa-4"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/35",
+          "uid": "musa-5"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/36",
+          "uid": "musa-6"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "channel",
+          "rate": 100000000000,
+          "snmp_name": "1/1/40",
+          "uid": "lag4"
+        },
+        {
+          "kind": "channel",
+          "rate": 100000000000,
+          "snmp_name": "1/1/41",
+          "uid": "lag4"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "router",
+          "rate": 10000000000,
+          "snmp_name": "1/1/46",
+          "uid": "gw"
+        }
+      ],
+      "rate": 25000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 8325-48Y8C",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "sw-1",
+  "warranty": "2048-05"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-3.json b/data/grid5000/sites/sophia/network_equipments/sw-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..75db0f68c78bad097cce239f5977e9bbb518e47a
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/sw-3.json
@@ -0,0 +1,262 @@
+{
+  "channels": {
+    "lag1": {
+      "kind": "server",
+      "port": "lag1",
+      "rate": 500000000000,
+      "uid": "srv-data1"
+    },
+    "lag2": {
+      "kind": "server",
+      "port": "lag2",
+      "rate": 500000000000,
+      "uid": "srv-data2"
+    },
+    "lag3": {
+      "kind": "server",
+      "port": "lag3",
+      "rate": 500000000000,
+      "uid": "srv-data3"
+    },
+    "lag4": {
+      "kind": "server",
+      "port": "lag4",
+      "rate": 200000000000,
+      "uid": "srv-data4"
+    }
+  },
+  "ip": "172.17.143.247",
+  "kind": "switch",
+  "linecards": [
+    {
+    },
+    {
+      "kavlan_pattern": "%LINECARD%/1/%PORT%",
+      "kind": "node",
+      "ports": [
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/1",
+          "uid": "uvb-11"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/2",
+          "uid": "uvb-12"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/3",
+          "uid": "mercantour1-15"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/4",
+          "uid": "mercantour1-16"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/5",
+          "uid": "mercantour1-11"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/6",
+          "uid": "mercantour1-12"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/7",
+          "uid": "mercantour1-7"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/8",
+          "uid": "mercantour1-8"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/9",
+          "uid": "mercantour1-3"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/10",
+          "uid": "mercantour1-4"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/11",
+          "uid": "mercantour2-7"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/12",
+          "uid": "mercantour2-8"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/13",
+          "uid": "mercantour2-3"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/14",
+          "uid": "mercantour2-4"
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/33",
+          "uid": "mercantour2-2"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/34",
+          "uid": "mercantour2-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/35",
+          "uid": "mercantour2-6"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/36",
+          "uid": "mercantour2-5"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/37",
+          "uid": "mercantour1-2"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/38",
+          "uid": "mercantour1-1"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/39",
+          "uid": "mercantour1-6"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/40",
+          "uid": "mercantour1-5"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/41",
+          "uid": "mercantour1-10"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/42",
+          "uid": "mercantour1-9"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/43",
+          "uid": "mercantour1-14"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/44",
+          "uid": "mercantour1-13"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/45",
+          "uid": "uvb-10"
+        },
+        {
+          "kind": "node",
+          "port": "eth0",
+          "snmp_name": "1/1/46",
+          "uid": "uvb-9"
+        },
+        {
+        },
+        {
+          "kind": "switch",
+          "snmp_name": "1/1/48",
+          "uid": "gw-ng"
+        }
+      ],
+      "rate": 1000000000,
+      "snmp_pattern": "%LINECARD%/1/%PORT%"
+    }
+  ],
+  "managed_by_us": true,
+  "model": "Aruba 6300M",
+  "site": "sophia",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "sw-3",
+  "warranty": "2048-05"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swx1nef.json b/data/grid5000/sites/sophia/network_equipments/swx1nef.json
deleted file mode 100644
index 09b92b311de653245e9268ff5534bf1340bfbd3d..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/network_equipments/swx1nef.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "backplane_bps": 240000000000,
-  "kind": "switch",
-  "linecards": [
-    {
-      "kind": "virtual",
-      "ports": [
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-          "kind": "router",
-          "port": "1/2",
-          "snmp_name": "Port: 5 Gigabit",
-          "uid": "gw"
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-          "kind": "switch",
-          "port": "0/103",
-          "snmp_name": "Port: 18 Gigabit",
-          "uid": "swy1nef"
-        },
-        {
-          "kind": "other",
-          "port": "eth3",
-          "snmp_name": "Port: 19 Gigabit",
-          "uid": "srv3"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "Port: %PORT% Gigabit"
-    }
-  ],
-  "managed_by_us": true,
-  "model": "Juniper EX2500-24F-FB",
-  "site": "sophia",
-  "snmp_community": "g5kadmin",
-  "type": "network_equipment",
-  "uid": "swx1nef",
-  "warranty": "expired"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swy1nef.json b/data/grid5000/sites/sophia/network_equipments/swy1nef.json
deleted file mode 100644
index 3190fc54f2f0cafa25e6e01e9836042a58d3f09e..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/network_equipments/swy1nef.json
+++ /dev/null
@@ -1,234 +0,0 @@
-{
-  "backplane_bps": 184000000000,
-  "ip": "172.16.143.249",
-  "kind": "switch",
-  "linecards": [
-    {
-      "kavlan_pattern": "%PORT%",
-      "kind": "node",
-      "ports": [
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-          "kind": "switch",
-          "port": "0/18",
-          "snmp_name": "Port: 103 Gigabit",
-          "uid": "swx1nef"
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "Port: %PORT% Gigabit"
-    }
-  ],
-  "managed_by_us": true,
-  "model": "Dell PowerConnect 6248",
-  "site": "sophia",
-  "snmp_community": "g5kadmin",
-  "type": "network_equipment",
-  "uid": "swy1nef",
-  "warranty": "expired"
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/servers/kadeploy-devel.json b/data/grid5000/sites/sophia/servers/kadeploy-devel.json
index 1ebf36bd8acda5c90d5443f5073c33302f108b50..f75d143d8a699ad1083bbdd01272a503c9311ea5 100644
--- a/data/grid5000/sites/sophia/servers/kadeploy-devel.json
+++ b/data/grid5000/sites/sophia/servers/kadeploy-devel.json
@@ -2,7 +2,7 @@
   "kind": "virtual",
   "network_adapters": {
     "adm": {
-      "ip": "172.17.143.105"
+      "ip": "172.17.143.127"
     },
     "default": {
       "ip": "172.16.143.127"
diff --git a/input/grid5000/sites/sophia/networks/gw-ng.yaml b/input/grid5000/sites/sophia/networks/gw-ng.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3b9f1302c91ddc0ae5fcc37f80a4dbe3dfc6f1da
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/gw-ng.yaml
@@ -0,0 +1,43 @@
+---
+gw-ng:
+  model: Aruba 6300M
+  warranty: 2048-05
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.253
+  snmp_community: public
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 1000000000
+      kind: node
+      ports:
+        47:
+          uid: sw-3
+          kind: switch
+        48:
+          uid: gw
+          kind: router
+  channels:
+    lag1:
+      kind: server
+      rate: 500000000000
+      uid: srv-data1
+      port: lag1
+    lag2:
+      kind: server
+      rate: 500000000000
+      uid: srv-data2
+      port: lag2
+    lag3:
+      kind: server
+      rate: 500000000000
+      uid: srv-data3
+      port: lag3
+    lag4:
+      kind: server
+      rate: 200000000000
+      uid: srv-data4
+      port: lag4
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index 5cac2d022c327cb570318e8ca7d570e4849bdd66..3c83b0c4994863b0236476c77689c554eaeb1411 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -136,10 +136,6 @@ gw:
         1:
           uid: renater-sophia
           kind: backbone
-        2:
-          uid: swx1nef
-          kind: switch
-          port: 0/5
     3:
       snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
       kavlan_pattern: "%LINECARD%/%PORT%"
@@ -170,12 +166,12 @@ gw:
       backplane_bps: 24000000000
       rate: 1000000000
       ports:
-        1: uvb-12
+        1:
         2: 
         4: 
         6: 
         8: 
-        9: uvb-11
+        9:
         10: 
         12: 
         14: 
@@ -203,11 +199,15 @@ gw:
       backplane_bps: 12000000000
       rate: 1000000000
       ports:
-        1: uvb-9
         2:
           uid: srv-data
           kind: server
-        3: uvb-10
+        7:
+          uid: gw-ng
+          kind: switch
+        9:
+          uid: sw-1
+          kind: switch
     6:
       snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
       kavlan_pattern: "%LINECARD%/%PORT%"
diff --git a/input/grid5000/sites/sophia/networks/sw-1.yaml b/input/grid5000/sites/sophia/networks/sw-1.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6b9969c9dbe828b8385b23bfeb8f4fdcbd3dbb7a
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/sw-1.yaml
@@ -0,0 +1,107 @@
+---
+sw-1:
+  model: Aruba 8325-48Y8C
+  warranty: 2048-05
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.251
+  snmp_community: public
+  backplane_bps: 1440000000000
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 25000000000
+      kind: node
+      ports:
+        1:
+        2:
+        3:
+          uid: lag1
+          kind: channel
+        4:
+          uid: lag1
+          kind: channel
+
+        5:
+          uid: lag2
+          kind: channel
+          rate: 25000000000
+        6:
+          uid: lag2
+          kind: channel
+
+        7:
+          uid: lag3
+          kind: channel
+        8:
+          uid: lag3
+          kind: channel
+        9:
+        10:
+        11:
+        12:
+        13:
+        14:
+        15:
+        16:
+        17:
+        18:
+        19:
+        20:
+        21:
+        22:
+        23:
+        24:
+        25:
+        26:
+        27:
+        28:
+        29:
+        30:
+        31:
+          uid: musa-1
+        32:
+          uid: musa-2
+        33:
+          uid: musa-3
+        34:
+          uid: musa-4
+        35:
+          uid: musa-5
+        36:
+          uid: musa-6
+        40:
+          uid: lag4
+          kind: channel
+          rate: 100000000000
+        41:
+          uid: lag4
+          kind: channel
+          rate: 100000000000
+        46:
+          uid: gw
+          kind: router
+          rate: 10000000000
+  channels:
+    lag1:
+      kind: server
+      rate: 500000000000
+      uid: srv-data1
+      port: lag1
+    lag2:
+      kind: server
+      rate: 500000000000
+      uid: srv-data2
+      port: lag2
+    lag3:
+      kind: server
+      rate: 500000000000
+      uid: srv-data3
+      port: lag3
+    lag4:
+      kind: server
+      rate: 200000000000
+      uid: srv-data4
+      port: lag4
diff --git a/input/grid5000/sites/sophia/networks/sw-3.yaml b/input/grid5000/sites/sophia/networks/sw-3.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..61760909d6c8f777474a06ad369c073cf1e7076c
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/sw-3.yaml
@@ -0,0 +1,96 @@
+---
+sw-3:
+  model: Aruba 6300M
+  warranty: 2048-05
+  kind: switch
+  managed_by_us: true
+  site: sophia
+  ip: 172.17.143.247
+  snmp_community: public
+  linecards:
+    1:
+      snmp_pattern: "%LINECARD%/1/%PORT%"
+      kavlan_pattern: "%LINECARD%/1/%PORT%"
+      rate: 1000000000
+      kind: node
+      ports:
+        1:
+          uid: uvb-11
+        2:
+          uid: uvb-12
+        3:
+          uid: mercantour1-15
+        4:
+          uid: mercantour1-16
+        5:
+          uid: mercantour1-11
+        6:
+          uid: mercantour1-12
+        7:
+          uid: mercantour1-7
+        8:
+          uid: mercantour1-8
+        9:
+          uid: mercantour1-3
+        10:
+          uid: mercantour1-4
+        11:
+          uid: mercantour2-7
+        12:
+          uid: mercantour2-8
+        13:
+          uid: mercantour2-3
+        14:
+          uid: mercantour2-4
+        33:
+          uid: mercantour2-2
+        34:
+          uid: mercantour2-1
+        35:
+          uid: mercantour2-6
+        36:
+          uid: mercantour2-5
+        37:
+          uid: mercantour1-2
+        38:
+          uid: mercantour1-1
+        39:
+          uid: mercantour1-6
+        40:
+          uid: mercantour1-5
+        41:
+          uid: mercantour1-10
+        42:
+          uid: mercantour1-9
+        43:
+          uid: mercantour1-14
+        44:
+          uid: mercantour1-13
+        45: 
+          uid: uvb-10
+        46:
+          uid: uvb-9
+        48:
+          uid: gw-ng
+          kind: switch
+  channels:
+    lag1:
+      kind: server
+      rate: 500000000000
+      uid: srv-data1
+      port: lag1
+    lag2:
+      kind: server
+      rate: 500000000000
+      uid: srv-data2
+      port: lag2
+    lag3:
+      kind: server
+      rate: 500000000000
+      uid: srv-data3
+      port: lag3
+    lag4:
+      kind: server
+      rate: 200000000000
+      uid: srv-data4
+      port: lag4
diff --git a/input/grid5000/sites/sophia/networks/swx1nef.yaml b/input/grid5000/sites/sophia/networks/swx1nef.yaml
deleted file mode 100644
index ee65099afc74fd278a94b109c8bce0b8ab9e6fa3..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/networks/swx1nef.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-swx1nef:
-  model: Juniper EX2500-24F-FB
-  warranty: expired
-  kind: switch
-  managed_by_us: true
-  site: sophia
-  snmp_community: g5kadmin
-  backplane_bps: 240000000000
-  linecards:
-    0:
-      snmp_pattern: "Port: %PORT% Gigabit"
-      kind: virtual
-      rate: 10000000000
-      ports:
-        5:
-          uid: gw
-          kind: router
-          port: 1/2
-        18:
-          uid: swy1nef
-          kind: switch
-          port: 0/103
-        19:
-          uid: srv3
-          kind: other
-          port: eth3
diff --git a/input/grid5000/sites/sophia/networks/swy1nef.yaml b/input/grid5000/sites/sophia/networks/swy1nef.yaml
deleted file mode 100644
index fa2f9097afde36e67967272485deb60cd894891f..0000000000000000000000000000000000000000
--- a/input/grid5000/sites/sophia/networks/swy1nef.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-swy1nef:
-  model: Dell PowerConnect 6248
-  warranty: expired
-  kind: switch
-  managed_by_us: true
-  site: sophia
-  snmp_community: g5kadmin
-  ip: 172.16.143.249
-  backplane_bps: 184000000000
-  linecards:
-    0:
-      snmp_pattern: "Port: %PORT% Gigabit"
-      kavlan_pattern: "%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        103:
-          uid: swx1nef
-          kind: switch
-          port: 0/18
diff --git a/input/grid5000/sites/sophia/servers/virtual.yaml b/input/grid5000/sites/sophia/servers/virtual.yaml
index f0692b07fdb2f0ef1a0b143c1e4084d27f1a7f33..4236b363398777dabfcb5651214fe8e231f5b2bf 100644
--- a/input/grid5000/sites/sophia/servers/virtual.yaml
+++ b/input/grid5000/sites/sophia/servers/virtual.yaml
@@ -66,7 +66,7 @@ kadeploy-devel:
     default:
       ip: 172.16.143.127
     adm:
-      ip: 172.17.143.105
+      ip: 172.17.143.127
 kavlan:
   kind: virtual
   alias: