diff --git a/data/grid5000/sites/lyon/clusters/neowise/neowise.json b/data/grid5000/sites/lyon/clusters/neowise/neowise.json
index d9d360527a1e95b4888ac612d6d154388d371486..fca181cd2990f519f54653ad2de6d404f7c5ad9d 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/neowise.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/neowise.json
@@ -3,7 +3,94 @@
   "exotic": true,
   "kavlan": false,
   "metrics": [
-
+    {
+      "description": "Input byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_bytes_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output byte counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_bytes_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Input packet counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifacein_packets_total",
+      "period": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    },
+    {
+      "description": "Output packet counter for the network device port",
+      "labels": {
+        "interface": "eth0"
+      },
+      "name": "network_ifaceout_packets_total",
+      "period": 15000,
+      "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": 15000,
+      "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": 15000,
+      "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": 15000,
+      "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": 15000,
+      "source": {
+        "protocol": "network_equipment"
+      }
+    }
   ],
   "model": "AMD-Penguin Computing",
   "queues": [
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
index 256e054c0396b96eb88ce158fac3cbe89e666563..3e591d6d2e6d221072fcb0960679f1f714ed7f38 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.json
@@ -98,19 +98,45 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.1",
+      "ip6": "2001:660:4406:400:8::1",
       "kavlan": false,
+      "mac": "18:c0:4d:11:37:a1",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-1.lyon.grid5000.fr"
+      "name": "eno1",
+      "network_address": "neowise-1.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw",
+      "switch_port": "ethernet1/1/11",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "eth1",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.11",
+      "ip6": "2001:660:4406:400:8:1:0:1",
       "kavlan": false,
+      "mac": "18:c0:4d:11:37:a2",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-1.lyon.grid5000.fr"
+      "name": "eno2",
+      "network_address": "neowise-1.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "sneowise",
+      "switch_port": "1/1",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "ib0",
@@ -159,33 +185,6 @@
       "mountable": false,
       "mounted": false,
       "network_address": "neowise-1-bmc.lyon.grid5000.fr"
-    },
-    {
-      "device": "eno1",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "ip": "172.16.55.1",
-      "kavlan": false,
-      "mac": "18:c0:4d:11:37:a1",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "eno2",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "18:c0:4d:11:37:a2",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno2",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
index d15c50f25b1d9d1e6ee607ddc74102f2a45c709e..be80c4d37fb429531084cba0407784f6e72d00d5 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.json
@@ -98,19 +98,45 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.10",
+      "ip6": "2001:660:4406:400:8::a",
       "kavlan": false,
+      "mac": "18:c0:4d:4e:b1:0f",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-10.lyon.grid5000.fr"
+      "name": "eno1",
+      "network_address": "neowise-10.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw",
+      "switch_port": "ethernet1/1/20",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "eth1",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.20",
+      "ip6": "2001:660:4406:400:8:1:0:a",
       "kavlan": false,
+      "mac": "18:c0:4d:4e:b1:10",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-10.lyon.grid5000.fr"
+      "name": "eno2",
+      "network_address": "neowise-10.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "sneowise",
+      "switch_port": "1/10",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "ib0",
@@ -159,33 +185,6 @@
       "mountable": false,
       "mounted": false,
       "network_address": "neowise-10-bmc.lyon.grid5000.fr"
-    },
-    {
-      "device": "eno1",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "ip": "172.16.55.10",
-      "kavlan": false,
-      "mac": "18:c0:4d:4e:b1:0f",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "eno2",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "18:c0:4d:4e:b1:10",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno2",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
index 285497270915df8f49f2724e6a1472404be126ad..cc2032eda9fae7fbe84da5533fdfe4116dea694f 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.json
@@ -98,19 +98,45 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.2",
+      "ip6": "2001:660:4406:400:8::2",
       "kavlan": false,
+      "mac": "18:c0:4d:75:ef:3c",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-2.lyon.grid5000.fr"
+      "name": "eno1",
+      "network_address": "neowise-2.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw",
+      "switch_port": "ethernet1/1/12",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "eth1",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.12",
+      "ip6": "2001:660:4406:400:8:1:0:2",
       "kavlan": false,
+      "mac": "18:c0:4d:75:ef:3d",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-2.lyon.grid5000.fr"
+      "name": "eno2",
+      "network_address": "neowise-2.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "sneowise",
+      "switch_port": "1/2",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "ib0",
@@ -159,33 +185,6 @@
       "mountable": false,
       "mounted": false,
       "network_address": "neowise-2-bmc.lyon.grid5000.fr"
-    },
-    {
-      "device": "eno1",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "ip": "172.16.55.2",
-      "kavlan": false,
-      "mac": "18:c0:4d:75:ef:3c",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "eno2",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "18:c0:4d:75:ef:3d",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno2",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
index f152a3c6c4c57cb0a113712ee0a34b207fe42cda..d718304e755f882333e153f57db44e2f07b4ec63 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.json
@@ -98,19 +98,45 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.3",
+      "ip6": "2001:660:4406:400:8::3",
       "kavlan": false,
+      "mac": "18:c0:4d:4a:ed:5d",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-3.lyon.grid5000.fr"
+      "name": "eno1",
+      "network_address": "neowise-3.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw",
+      "switch_port": "ethernet1/1/13",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "eth1",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.13",
+      "ip6": "2001:660:4406:400:8:1:0:3",
       "kavlan": false,
+      "mac": "18:c0:4d:4a:ed:5e",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-3.lyon.grid5000.fr"
+      "name": "eno2",
+      "network_address": "neowise-3.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "sneowise",
+      "switch_port": "1/3",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "ib0",
@@ -159,33 +185,6 @@
       "mountable": false,
       "mounted": false,
       "network_address": "neowise-3-bmc.lyon.grid5000.fr"
-    },
-    {
-      "device": "eno1",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "ip": "172.16.55.3",
-      "kavlan": false,
-      "mac": "18:c0:4d:4a:ed:5d",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "eno2",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "18:c0:4d:4a:ed:5e",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno2",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
index aaf27d51be077eb55f6ba9ded0585c83b4cdcaf9..6cdddc471750c7c0b69ca8d15f0f5a4d04d4dc27 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.json
@@ -98,19 +98,45 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.4",
+      "ip6": "2001:660:4406:400:8::4",
       "kavlan": false,
+      "mac": "18:c0:4d:4e:b1:07",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-4.lyon.grid5000.fr"
+      "name": "eno1",
+      "network_address": "neowise-4.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw",
+      "switch_port": "ethernet1/1/14",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "eth1",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.14",
+      "ip6": "2001:660:4406:400:8:1:0:4",
       "kavlan": false,
+      "mac": "18:c0:4d:4e:b1:08",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-4.lyon.grid5000.fr"
+      "name": "eno2",
+      "network_address": "neowise-4.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "sneowise",
+      "switch_port": "1/4",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "ib0",
@@ -159,33 +185,6 @@
       "mountable": false,
       "mounted": false,
       "network_address": "neowise-4-bmc.lyon.grid5000.fr"
-    },
-    {
-      "device": "eno1",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "ip": "172.16.55.4",
-      "kavlan": false,
-      "mac": "18:c0:4d:4e:b1:07",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "eno2",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "18:c0:4d:4e:b1:08",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno2",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
index 1d04d5e8c75bae1d1354537a3418ea2d766b4975..f633fbaf0fb437a29b38cdc9d037699c121ae0f5 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.json
@@ -98,19 +98,45 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.5",
+      "ip6": "2001:660:4406:400:8::5",
       "kavlan": false,
+      "mac": "18:c0:4d:75:f1:38",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-5.lyon.grid5000.fr"
+      "name": "eno1",
+      "network_address": "neowise-5.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw",
+      "switch_port": "ethernet1/1/15",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "eth1",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.15",
+      "ip6": "2001:660:4406:400:8:1:0:5",
       "kavlan": false,
+      "mac": "18:c0:4d:75:f1:39",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-5.lyon.grid5000.fr"
+      "name": "eno2",
+      "network_address": "neowise-5.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "sneowise",
+      "switch_port": "1/5",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "ib0",
@@ -159,33 +185,6 @@
       "mountable": false,
       "mounted": false,
       "network_address": "neowise-5-bmc.lyon.grid5000.fr"
-    },
-    {
-      "device": "eno1",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "ip": "172.16.55.5",
-      "kavlan": false,
-      "mac": "18:c0:4d:75:f1:38",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "eno2",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "18:c0:4d:75:f1:39",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno2",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
index ac915a03e8e62d661a2b0aff6595ade8c1d14044..18a33ec415a3d5c82fdc4d4c6843c799eb10aa5e 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.json
@@ -98,19 +98,45 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.6",
+      "ip6": "2001:660:4406:400:8::6",
       "kavlan": false,
+      "mac": "18:c0:4d:4a:ed:09",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-6.lyon.grid5000.fr"
+      "name": "eno1",
+      "network_address": "neowise-6.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw",
+      "switch_port": "ethernet1/1/16",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "eth1",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.16",
+      "ip6": "2001:660:4406:400:8:1:0:6",
       "kavlan": false,
+      "mac": "18:c0:4d:4a:ed:0a",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-6.lyon.grid5000.fr"
+      "name": "eno2",
+      "network_address": "neowise-6.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "sneowise",
+      "switch_port": "1/6",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "ib0",
@@ -159,33 +185,6 @@
       "mountable": false,
       "mounted": false,
       "network_address": "neowise-6-bmc.lyon.grid5000.fr"
-    },
-    {
-      "device": "eno1",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "ip": "172.16.55.6",
-      "kavlan": false,
-      "mac": "18:c0:4d:4a:ed:09",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "eno2",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "18:c0:4d:4a:ed:0a",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno2",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
index fe5a585cfcc46a10a5ca230870ddcbf989811d08..67724823de1ae3a4e9b131f48c05f74fa05dd429 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.json
@@ -98,19 +98,45 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.7",
+      "ip6": "2001:660:4406:400:8::7",
       "kavlan": false,
+      "mac": "18:c0:4d:1e:89:64",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-7.lyon.grid5000.fr"
+      "name": "eno1",
+      "network_address": "neowise-7.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw",
+      "switch_port": "ethernet1/1/17",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "eth1",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.17",
+      "ip6": "2001:660:4406:400:8:1:0:7",
       "kavlan": false,
+      "mac": "18:c0:4d:1e:89:65",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-7.lyon.grid5000.fr"
+      "name": "eno2",
+      "network_address": "neowise-7.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "sneowise",
+      "switch_port": "1/7",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "ib0",
@@ -159,33 +185,6 @@
       "mountable": false,
       "mounted": false,
       "network_address": "neowise-7-bmc.lyon.grid5000.fr"
-    },
-    {
-      "device": "eno1",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "ip": "172.16.55.7",
-      "kavlan": false,
-      "mac": "18:c0:4d:1e:89:64",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "eno2",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "18:c0:4d:1e:89:65",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno2",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
     }
   ],
   "operating_system": {
diff --git a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
index 0564f2e3b44ed852a8a4d142668e776d12073446..a5bc6deb67db3370bc20cea221a5374e3cce2f5d 100644
--- a/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
+++ b/data/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.json
@@ -98,19 +98,45 @@
   "network_adapters": [
     {
       "device": "eth0",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.9",
+      "ip6": "2001:660:4406:400:8::9",
       "kavlan": false,
+      "mac": "b4:2e:99:b4:c6:fa",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-9.lyon.grid5000.fr"
+      "name": "eno1",
+      "network_address": "neowise-9.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "gw",
+      "switch_port": "ethernet1/1/19",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "eth1",
+      "driver": "mlx5_core",
       "enabled": true,
+      "firmware_version": "14.22.1002 (GIG0000000005)",
+      "interface": "Ethernet",
+      "ip": "172.16.55.19",
+      "ip6": "2001:660:4406:400:8:1:0:9",
       "kavlan": false,
+      "mac": "b4:2e:99:b4:c6:fb",
+      "management": false,
+      "model": "MT27710 Family [ConnectX-4 Lx]",
       "mountable": true,
       "mounted": true,
-      "network_address": "neowise-9.lyon.grid5000.fr"
+      "name": "eno2",
+      "network_address": "neowise-9.lyon.grid5000.fr",
+      "rate": 10000000000,
+      "switch": "sneowise",
+      "switch_port": "1/9",
+      "vendor": "Mellanox Technologies"
     },
     {
       "device": "ib0",
@@ -159,33 +185,6 @@
       "mountable": false,
       "mounted": false,
       "network_address": "neowise-9-bmc.lyon.grid5000.fr"
-    },
-    {
-      "device": "eno1",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "ip": "172.16.55.9",
-      "kavlan": false,
-      "mac": "b4:2e:99:b4:c6:fa",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno1",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
-    },
-    {
-      "device": "eno2",
-      "driver": "mlx5_core",
-      "firmware_version": "14.22.1002 (GIG0000000005)",
-      "interface": "Ethernet",
-      "kavlan": false,
-      "mac": "b4:2e:99:b4:c6:fb",
-      "management": false,
-      "model": "MT27710 Family [ConnectX-4 Lx]",
-      "name": "eno2",
-      "rate": 10000000000,
-      "vendor": "Mellanox Technologies"
     }
   ],
   "operating_system": {
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml
index 3b1bca3bf6fbeeca80e02399794700b992cc6415..96f4593d8dd460c143ee0836c3480338ff78b421 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-1.yaml
@@ -88,7 +88,7 @@ neowise-1:
       ip: 172.17.55.1
       mac: 18:c0:4d:11:37:a3
       management: true
-    eno1:
+    eth0:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
@@ -99,7 +99,7 @@ neowise-1:
       name: eno1
       rate: 10000000000
       vendor: Mellanox Technologies
-    eno2:
+    eth1:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml
index 7a6cfb3b704a8e940f7080e3837d9053cec34705..d63def86bbe5cfb85a26663eaa7d3f451144e689 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-10.yaml
@@ -88,7 +88,7 @@ neowise-10:
       ip: 172.17.55.10
       mac: 18:c0:4d:4e:b1:11
       management: true
-    eno1:
+    eth0:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
@@ -99,7 +99,7 @@ neowise-10:
       name: eno1
       rate: 10000000000
       vendor: Mellanox Technologies
-    eno2:
+    eth1:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml
index 76c4ffd4a0127316fb33e5526988af3920df1053..66668caeba21cdcfdcd106674a6d641291ee41e0 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-2.yaml
@@ -88,7 +88,7 @@ neowise-2:
       ip: 172.17.55.2
       mac: 18:c0:4d:75:ef:3e
       management: true
-    eno1:
+    eth0:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
@@ -99,7 +99,7 @@ neowise-2:
       name: eno1
       rate: 10000000000
       vendor: Mellanox Technologies
-    eno2:
+    eth1:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml
index 9c8235483d9145a5a2e55eec82a5cbdc6dc0641e..19459b9159dec4d1f05d0bc65018b212e55048df 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-3.yaml
@@ -88,7 +88,7 @@ neowise-3:
       ip: 172.17.55.3
       mac: 18:c0:4d:4a:ed:5f
       management: true
-    eno1:
+    eth0:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
@@ -99,7 +99,7 @@ neowise-3:
       name: eno1
       rate: 10000000000
       vendor: Mellanox Technologies
-    eno2:
+    eth1:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml
index cb6c8a1fae425c40e7651a020bb67b8f4874bcd0..1f9e690d53f0011b90109672e505673fe9c04d42 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-4.yaml
@@ -88,7 +88,7 @@ neowise-4:
       ip: 172.17.55.4
       mac: 18:c0:4d:4e:b1:09
       management: true
-    eno1:
+    eth0:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
@@ -99,7 +99,7 @@ neowise-4:
       name: eno1
       rate: 10000000000
       vendor: Mellanox Technologies
-    eno2:
+    eth1:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml
index 042f3a0142590173d4812a280d2dbfe2a378746c..8c56be71eecdf7c3b0fd11cd74d345932e5233ac 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-5.yaml
@@ -88,7 +88,7 @@ neowise-5:
       ip: 172.17.55.5
       mac: 18:c0:4d:75:f1:3a
       management: true
-    eno1:
+    eth0:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
@@ -99,7 +99,7 @@ neowise-5:
       name: eno1
       rate: 10000000000
       vendor: Mellanox Technologies
-    eno2:
+    eth1:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml
index d2ec58c24aa38f61d664a8e8b1d9e0adc5cb5ea6..ff820408a414fef3d47f2a10ef854e96549816b7 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-6.yaml
@@ -88,7 +88,7 @@ neowise-6:
       ip: 172.17.55.6
       mac: 18:c0:4d:4a:ed:0b
       management: true
-    eno1:
+    eth0:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
@@ -99,7 +99,7 @@ neowise-6:
       name: eno1
       rate: 10000000000
       vendor: Mellanox Technologies
-    eno2:
+    eth1:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml
index 0fb8e2783c719581636e18cb3dd3268502464b44..6b76ed81c25af28603c97ae77e521b7dfe8a278d 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-7.yaml
@@ -88,7 +88,7 @@ neowise-7:
       ip: 172.17.55.7
       mac: 18:c0:4d:1e:89:66
       management: true
-    eno1:
+    eth0:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
@@ -99,7 +99,7 @@ neowise-7:
       name: eno1
       rate: 10000000000
       vendor: Mellanox Technologies
-    eno2:
+    eth1:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
diff --git a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml
index 0a875233e9488dccedc82f82a7bb319a6ead8bdb..50e05c282150b3114c03c736856596fba15d2807 100644
--- a/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml
+++ b/input/grid5000/sites/lyon/clusters/neowise/nodes/neowise-9.yaml
@@ -88,7 +88,7 @@ neowise-9:
       ip: 172.17.55.9
       mac: b4:2e:99:b4:c6:fc
       management: true
-    eno1:
+    eth0:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
@@ -99,7 +99,7 @@ neowise-9:
       name: eno1
       rate: 10000000000
       vendor: Mellanox Technologies
-    eno2:
+    eth1:
       driver: mlx5_core
       firmware_version: 14.22.1002 (GIG0000000005)
       interface: Ethernet
diff --git a/lib/refrepo/net_names_mapping.yaml b/lib/refrepo/net_names_mapping.yaml
index 314a40b7cdacca40f2aedd445a1171e1d0ad4b76..d6d68f1896b4b5aa092c9da6ca1199edbbb1d9fa 100644
--- a/lib/refrepo/net_names_mapping.yaml
+++ b/lib/refrepo/net_names_mapping.yaml
@@ -137,6 +137,9 @@ nova:
   eno4: eth5
   enp5s0f0: eth0
   enp5s0f1: eth1
+neowise: 
+  eno1: eth0
+  eno2: eth1
 orion:
   eno1: eth2
   eno2: eth3