From cf7ce6e76bfe98f32b705691ee5de4acaa437b8c Mon Sep 17 00:00:00 2001
From: Dimitri DELABROYE <dimitri.delabroye@inria.fr>
Date: Thu, 21 Mar 2019 15:43:10 +0100
Subject: [PATCH] [all] migration to a new schema for network

- eth1 suffix from sagittaire a remain because it is the default interface
- remove weathermap
- remove sensors/network
- rename gw-site to gw
- add snmp_name per port
- add backbone kind for renater uplink
- add alias on network equipments
- add ip on network equipments
- add role key [admin, production, hpc]
- rework port-channel definition
- fix typos on some ports
---
 .../network_equipments/renater-grenoble.json  |    4 +-
 .../network_equipments/renater-lille.json     |    4 +-
 .../renater-luxembourg.json                   |    4 +-
 .../network_equipments/renater-lyon.json      |    4 +-
 .../network_equipments/renater-nancy.json     |    4 +-
 .../network_equipments/renater-nantes.json    |    4 +-
 .../network_equipments/renater-paris.json     |    4 +-
 .../network_equipments/renater-rennes.json    |    4 +-
 .../network_equipments/renater-sophia.json    |    4 +-
 .../sites/grenoble/network_equipments/gw.json |   80 +-
 .../network_equipments/sw-chiclet-1.json      |   68 +-
 .../network_equipments/sw-chiclet-2.json      |   74 +-
 .../network_equipments/sw-chiclet-3.json      |   82 +-
 .../clusters/granduc/nodes/granduc-12.json    |    4 +-
 .../clusters/granduc/nodes/granduc-15.json    |    4 +-
 .../clusters/granduc/nodes/granduc-16.json    |    4 +-
 .../clusters/granduc/nodes/granduc-18.json    |    4 +-
 .../clusters/granduc/nodes/granduc-2.json     |    4 +-
 .../clusters/granduc/nodes/granduc-20.json    |    4 +-
 .../clusters/granduc/nodes/granduc-21.json    |    4 +-
 .../clusters/granduc/nodes/granduc-3.json     |    4 +-
 .../clusters/granduc/nodes/granduc-4.json     |    4 +-
 .../clusters/granduc/nodes/granduc-6.json     |    4 +-
 .../clusters/granduc/nodes/granduc-9.json     |    4 +-
 .../{gw-luxembourg.json => gw.json}           |   94 +-
 .../luxembourg/network_equipments/mxl1.json   |   75 +-
 .../luxembourg/network_equipments/mxl2.json   |   75 +-
 .../network_equipments/ul-grid5000-sw02.json  |  134 ++-
 .../lyon/clusters/gemini/nodes/gemini-1.json  |    2 +-
 .../lyon/clusters/gemini/nodes/gemini-2.json  |    2 +-
 .../lyon/network_equipments/force10.json      |   88 +-
 .../{gw-lyon.json => gw.json}                 |   41 +-
 .../sites/lyon/network_equipments/salome.json |   49 +-
 .../clusters/graffiti/nodes/graffiti-1.json   |    2 +-
 .../clusters/graffiti/nodes/graffiti-10.json  |    2 +-
 .../clusters/graffiti/nodes/graffiti-11.json  |    2 +-
 .../clusters/graffiti/nodes/graffiti-12.json  |    2 +-
 .../clusters/graffiti/nodes/graffiti-13.json  |    2 +-
 .../clusters/graffiti/nodes/graffiti-2.json   |    2 +-
 .../clusters/graffiti/nodes/graffiti-3.json   |    2 +-
 .../clusters/graffiti/nodes/graffiti-4.json   |    2 +-
 .../clusters/graffiti/nodes/graffiti-5.json   |    2 +-
 .../clusters/graffiti/nodes/graffiti-6.json   |    2 +-
 .../clusters/graffiti/nodes/graffiti-7.json   |    2 +-
 .../clusters/graffiti/nodes/graffiti-8.json   |    2 +-
 .../clusters/graffiti/nodes/graffiti-9.json   |    2 +-
 .../clusters/graoully/nodes/graoully-1.json   |    2 +-
 .../clusters/graoully/nodes/graoully-10.json  |    2 +-
 .../clusters/graoully/nodes/graoully-11.json  |    2 +-
 .../clusters/graoully/nodes/graoully-12.json  |    2 +-
 .../clusters/graoully/nodes/graoully-13.json  |    2 +-
 .../clusters/graoully/nodes/graoully-14.json  |    2 +-
 .../clusters/graoully/nodes/graoully-15.json  |    2 +-
 .../clusters/graoully/nodes/graoully-16.json  |    2 +-
 .../clusters/graoully/nodes/graoully-2.json   |    2 +-
 .../clusters/graoully/nodes/graoully-3.json   |    2 +-
 .../clusters/graoully/nodes/graoully-4.json   |    2 +-
 .../clusters/graoully/nodes/graoully-5.json   |    2 +-
 .../clusters/graoully/nodes/graoully-6.json   |    2 +-
 .../clusters/graoully/nodes/graoully-7.json   |    2 +-
 .../clusters/graoully/nodes/graoully-8.json   |    2 +-
 .../clusters/graoully/nodes/graoully-9.json   |    2 +-
 .../clusters/graphique/nodes/graphique-1.json |    2 +-
 .../clusters/graphique/nodes/graphique-2.json |    2 +-
 .../clusters/graphique/nodes/graphique-3.json |    2 +-
 .../clusters/graphique/nodes/graphique-4.json |    2 +-
 .../clusters/graphique/nodes/graphique-5.json |    2 +-
 .../clusters/graphique/nodes/graphique-6.json |    2 +-
 .../clusters/graphite/nodes/graphite-1.json   |    2 +-
 .../clusters/graphite/nodes/graphite-2.json   |    2 +-
 .../clusters/graphite/nodes/graphite-3.json   |    2 +-
 .../clusters/graphite/nodes/graphite-4.json   |    2 +-
 .../nancy/clusters/grcinq/nodes/grcinq-1.json |    2 +-
 .../clusters/grcinq/nodes/grcinq-10.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-11.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-12.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-13.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-14.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-15.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-16.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-17.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-18.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-19.json      |    2 +-
 .../nancy/clusters/grcinq/nodes/grcinq-2.json |    2 +-
 .../clusters/grcinq/nodes/grcinq-20.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-21.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-22.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-23.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-24.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-25.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-26.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-27.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-28.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-29.json      |    2 +-
 .../nancy/clusters/grcinq/nodes/grcinq-3.json |    2 +-
 .../clusters/grcinq/nodes/grcinq-30.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-31.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-32.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-33.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-34.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-35.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-36.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-37.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-38.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-39.json      |    2 +-
 .../nancy/clusters/grcinq/nodes/grcinq-4.json |    2 +-
 .../clusters/grcinq/nodes/grcinq-40.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-41.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-42.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-43.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-44.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-45.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-46.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-47.json      |    2 +-
 .../clusters/grcinq/nodes/grcinq-48.json      |    2 +-
 .../nancy/clusters/grcinq/nodes/grcinq-5.json |    2 +-
 .../nancy/clusters/grcinq/nodes/grcinq-6.json |    2 +-
 .../nancy/clusters/grcinq/nodes/grcinq-7.json |    2 +-
 .../nancy/clusters/grcinq/nodes/grcinq-8.json |    2 +-
 .../nancy/clusters/grcinq/nodes/grcinq-9.json |    2 +-
 .../nancy/clusters/grele/nodes/grele-1.json   |    2 +-
 .../nancy/clusters/grele/nodes/grele-10.json  |    2 +-
 .../nancy/clusters/grele/nodes/grele-11.json  |    2 +-
 .../nancy/clusters/grele/nodes/grele-12.json  |    2 +-
 .../nancy/clusters/grele/nodes/grele-13.json  |    2 +-
 .../nancy/clusters/grele/nodes/grele-14.json  |    2 +-
 .../nancy/clusters/grele/nodes/grele-2.json   |    2 +-
 .../nancy/clusters/grele/nodes/grele-3.json   |    2 +-
 .../nancy/clusters/grele/nodes/grele-4.json   |    2 +-
 .../nancy/clusters/grele/nodes/grele-5.json   |    2 +-
 .../nancy/clusters/grele/nodes/grele-6.json   |    2 +-
 .../nancy/clusters/grele/nodes/grele-7.json   |    2 +-
 .../nancy/clusters/grele/nodes/grele-8.json   |    2 +-
 .../nancy/clusters/grele/nodes/grele-9.json   |    2 +-
 .../clusters/grimani/nodes/grimani-1.json     |    2 +-
 .../clusters/grimani/nodes/grimani-2.json     |    2 +-
 .../clusters/grimani/nodes/grimani-3.json     |    2 +-
 .../clusters/grimani/nodes/grimani-4.json     |    2 +-
 .../clusters/grimani/nodes/grimani-5.json     |    2 +-
 .../clusters/grimani/nodes/grimani-6.json     |    2 +-
 .../clusters/grimoire/nodes/grimoire-1.json   |    8 +-
 .../clusters/grimoire/nodes/grimoire-2.json   |    8 +-
 .../clusters/grimoire/nodes/grimoire-3.json   |    8 +-
 .../clusters/grimoire/nodes/grimoire-4.json   |    8 +-
 .../clusters/grimoire/nodes/grimoire-5.json   |    8 +-
 .../clusters/grimoire/nodes/grimoire-6.json   |    8 +-
 .../clusters/grimoire/nodes/grimoire-7.json   |    8 +-
 .../clusters/grimoire/nodes/grimoire-8.json   |    8 +-
 .../nancy/clusters/grisou/nodes/grisou-1.json |    8 +-
 .../clusters/grisou/nodes/grisou-10.json      |    8 +-
 .../clusters/grisou/nodes/grisou-11.json      |    8 +-
 .../clusters/grisou/nodes/grisou-12.json      |    8 +-
 .../clusters/grisou/nodes/grisou-13.json      |    8 +-
 .../clusters/grisou/nodes/grisou-14.json      |    8 +-
 .../clusters/grisou/nodes/grisou-15.json      |    8 +-
 .../clusters/grisou/nodes/grisou-16.json      |    8 +-
 .../clusters/grisou/nodes/grisou-17.json      |    8 +-
 .../clusters/grisou/nodes/grisou-18.json      |    8 +-
 .../clusters/grisou/nodes/grisou-19.json      |    8 +-
 .../nancy/clusters/grisou/nodes/grisou-2.json |    8 +-
 .../clusters/grisou/nodes/grisou-20.json      |    8 +-
 .../clusters/grisou/nodes/grisou-21.json      |    8 +-
 .../clusters/grisou/nodes/grisou-22.json      |    8 +-
 .../clusters/grisou/nodes/grisou-23.json      |    8 +-
 .../clusters/grisou/nodes/grisou-24.json      |    8 +-
 .../clusters/grisou/nodes/grisou-25.json      |    8 +-
 .../clusters/grisou/nodes/grisou-26.json      |    8 +-
 .../clusters/grisou/nodes/grisou-27.json      |    8 +-
 .../clusters/grisou/nodes/grisou-28.json      |    8 +-
 .../clusters/grisou/nodes/grisou-29.json      |    8 +-
 .../nancy/clusters/grisou/nodes/grisou-3.json |    8 +-
 .../clusters/grisou/nodes/grisou-30.json      |    8 +-
 .../clusters/grisou/nodes/grisou-31.json      |    8 +-
 .../clusters/grisou/nodes/grisou-32.json      |    8 +-
 .../clusters/grisou/nodes/grisou-33.json      |    8 +-
 .../clusters/grisou/nodes/grisou-34.json      |    8 +-
 .../clusters/grisou/nodes/grisou-35.json      |    8 +-
 .../clusters/grisou/nodes/grisou-36.json      |    8 +-
 .../clusters/grisou/nodes/grisou-37.json      |    8 +-
 .../clusters/grisou/nodes/grisou-38.json      |    8 +-
 .../clusters/grisou/nodes/grisou-39.json      |    8 +-
 .../nancy/clusters/grisou/nodes/grisou-4.json |    8 +-
 .../clusters/grisou/nodes/grisou-40.json      |    8 +-
 .../clusters/grisou/nodes/grisou-41.json      |    8 +-
 .../clusters/grisou/nodes/grisou-42.json      |    8 +-
 .../clusters/grisou/nodes/grisou-43.json      |    8 +-
 .../clusters/grisou/nodes/grisou-44.json      |    8 +-
 .../clusters/grisou/nodes/grisou-45.json      |    8 +-
 .../clusters/grisou/nodes/grisou-46.json      |    8 +-
 .../clusters/grisou/nodes/grisou-47.json      |    8 +-
 .../clusters/grisou/nodes/grisou-48.json      |    8 +-
 .../clusters/grisou/nodes/grisou-49.json      |    8 +-
 .../nancy/clusters/grisou/nodes/grisou-5.json |    8 +-
 .../clusters/grisou/nodes/grisou-50.json      |    8 +-
 .../clusters/grisou/nodes/grisou-51.json      |    8 +-
 .../nancy/clusters/grisou/nodes/grisou-6.json |    8 +-
 .../nancy/clusters/grisou/nodes/grisou-7.json |    8 +-
 .../nancy/clusters/grisou/nodes/grisou-8.json |    8 +-
 .../nancy/clusters/grisou/nodes/grisou-9.json |    8 +-
 .../nancy/clusters/grue/nodes/grue-1.json     |    2 +-
 .../nancy/clusters/grue/nodes/grue-2.json     |    2 +-
 .../nancy/clusters/grue/nodes/grue-3.json     |    2 +-
 .../nancy/clusters/grue/nodes/grue-4.json     |    2 +-
 .../nancy/clusters/grue/nodes/grue-5.json     |    2 +-
 .../{gw-nancy.json => gw.json}                |  340 +++++-
 .../nancy/network_equipments/sgraoullyib.json |   16 +-
 .../nancy/network_equipments/sgrcinq.json     |   79 +-
 .../nancy/network_equipments/sgrele-opf.json  |   20 +-
 .../nancy/network_equipments/sgrisou1.json    |   67 +-
 .../nancy/network_equipments/sgros1.json      |  181 ++-
 .../nancy/network_equipments/sgros2.json      |  181 ++-
 .../nancy/network_equipments/sgrvingt.json    |  120 +-
 .../clusters/econome/nodes/econome-1.json     |    2 +-
 .../clusters/econome/nodes/econome-10.json    |    2 +-
 .../clusters/econome/nodes/econome-11.json    |    2 +-
 .../clusters/econome/nodes/econome-12.json    |    2 +-
 .../clusters/econome/nodes/econome-13.json    |    2 +-
 .../clusters/econome/nodes/econome-14.json    |    2 +-
 .../clusters/econome/nodes/econome-15.json    |    2 +-
 .../clusters/econome/nodes/econome-16.json    |    2 +-
 .../clusters/econome/nodes/econome-17.json    |    2 +-
 .../clusters/econome/nodes/econome-18.json    |    2 +-
 .../clusters/econome/nodes/econome-19.json    |    2 +-
 .../clusters/econome/nodes/econome-2.json     |    2 +-
 .../clusters/econome/nodes/econome-20.json    |    2 +-
 .../clusters/econome/nodes/econome-21.json    |    2 +-
 .../clusters/econome/nodes/econome-22.json    |    2 +-
 .../clusters/econome/nodes/econome-3.json     |    2 +-
 .../clusters/econome/nodes/econome-4.json     |    2 +-
 .../clusters/econome/nodes/econome-5.json     |    2 +-
 .../clusters/econome/nodes/econome-6.json     |    2 +-
 .../clusters/econome/nodes/econome-7.json     |    2 +-
 .../clusters/econome/nodes/econome-8.json     |    2 +-
 .../clusters/econome/nodes/econome-9.json     |    2 +-
 .../network_equipments/ecotype-prod1.json     |   85 +-
 .../network_equipments/ecotype-prod2.json     |   87 +-
 .../{gw-nantes.json => gw.json}               |   90 +-
 .../clusters/parasilo/nodes/parasilo-1.json   |    4 +-
 .../clusters/parasilo/nodes/parasilo-10.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-11.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-12.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-13.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-14.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-15.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-16.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-17.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-18.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-19.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-2.json   |    4 +-
 .../clusters/parasilo/nodes/parasilo-20.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-21.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-22.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-23.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-24.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-25.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-26.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-27.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-28.json  |    4 +-
 .../clusters/parasilo/nodes/parasilo-3.json   |    4 +-
 .../clusters/parasilo/nodes/parasilo-4.json   |    4 +-
 .../clusters/parasilo/nodes/parasilo-5.json   |    4 +-
 .../clusters/parasilo/nodes/parasilo-6.json   |    4 +-
 .../clusters/parasilo/nodes/parasilo-7.json   |    4 +-
 .../clusters/parasilo/nodes/parasilo-8.json   |    4 +-
 .../clusters/parasilo/nodes/parasilo-9.json   |    4 +-
 .../rennes/network_equipments/bigdata-sw.json |   58 +-
 .../rennes/network_equipments/c6509.json      |   65 +-
 .../{gw-rennes.json => gw.json}               |  125 +-
 .../network_equipments/paravance-sw-1.json    |  108 +-
 .../network_equipments/paravance-sw-2.json    |  108 +-
 .../sophia/clusters/suno/nodes/suno-1.json    |    2 +-
 .../sophia/clusters/suno/nodes/suno-10.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-11.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-12.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-13.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-14.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-15.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-16.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-17.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-18.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-19.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-2.json    |    2 +-
 .../sophia/clusters/suno/nodes/suno-20.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-21.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-22.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-23.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-24.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-25.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-26.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-27.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-28.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-29.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-3.json    |    2 +-
 .../sophia/clusters/suno/nodes/suno-30.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-31.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-32.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-33.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-34.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-35.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-36.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-37.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-38.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-39.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-4.json    |    2 +-
 .../sophia/clusters/suno/nodes/suno-40.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-41.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-42.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-43.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-44.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-45.json   |    2 +-
 .../sophia/clusters/suno/nodes/suno-5.json    |    2 +-
 .../sophia/clusters/suno/nodes/suno-6.json    |    2 +-
 .../sophia/clusters/suno/nodes/suno-7.json    |    2 +-
 .../sophia/clusters/suno/nodes/suno-8.json    |    2 +-
 .../sophia/clusters/suno/nodes/suno-9.json    |    2 +-
 .../sophia/network_equipments/edgeiron.json   |  225 ----
 .../{gw-sophia.json => gw.json}               |  151 ++-
 .../sophia/network_equipments/swx1nef.json    |   10 +-
 .../sophia/network_equipments/swy1nef.json    |   55 +-
 .../grid5000/sites/grenoble/networks/gw.yaml  |   23 +-
 .../sites/lille/networks/sw-chiclet-1.yaml    |  122 +-
 .../sites/lille/networks/sw-chiclet-2.yaml    |   52 +-
 .../sites/lille/networks/sw-chiclet-3.yaml    |  164 +--
 .../luxembourg/networks/gw-luxembourg.yaml    |   96 +-
 .../sites/luxembourg/networks/mxl1.yaml       |   60 +-
 .../sites/luxembourg/networks/mxl2.yaml       |   90 +-
 .../luxembourg/networks/ul-grid5000-sw02.yaml |  137 +--
 .../grid5000/sites/lyon/networks/force10.yaml |   38 +-
 .../grid5000/sites/lyon/networks/gw-lyon.yaml |   25 +-
 .../grid5000/sites/lyon/networks/salome.yaml  |   15 +-
 .../sites/nancy/networks/gw-nancy.yaml        | 1002 ++++-------------
 .../sites/nancy/networks/net-links.yaml       |   34 -
 .../sites/nancy/networks/sgraoullyib.yaml     |    9 +-
 .../sites/nancy/networks/sgrcinq.yaml         |   19 +-
 .../sites/nancy/networks/sgrele-opf.yaml      |   13 +-
 .../sites/nancy/networks/sgrisou1.yaml        |  205 +---
 .../grid5000/sites/nancy/networks/sgros1.yaml |  106 +-
 .../grid5000/sites/nancy/networks/sgros2.yaml |  352 +++---
 .../sites/nancy/networks/sgrvingt.yaml        |   34 +-
 .../sites/nantes/networks/ecotype-prod1.yaml  |   29 +-
 .../sites/nantes/networks/ecotype-prod2.yaml  |  127 ++-
 .../sites/nantes/networks/gw-nantes.yaml      |   62 +-
 .../sites/nantes/networks/net-links.yaml      |   18 -
 .../sites/rennes/networks/bigdata-sw.yaml     |   70 +-
 .../grid5000/sites/rennes/networks/c6509.yaml |   63 +-
 .../sites/rennes/networks/gw-rennes.yaml      |  219 +---
 .../sites/rennes/networks/paravance-sw-1.yaml |  242 +---
 .../sites/rennes/networks/paravance-sw-2.yaml |  242 +---
 .../sites/sophia/networks/edgeiron.yaml       |  100 --
 .../sites/sophia/networks/gw-sophia.yaml      |   74 +-
 .../sites/sophia/networks/swx1nef.yaml        |    3 +-
 .../sites/sophia/networks/swy1nef.yaml        |    5 +-
 352 files changed, 3641 insertions(+), 4266 deletions(-)
 rename data/grid5000/sites/luxembourg/network_equipments/{gw-luxembourg.json => gw.json} (76%)
 rename data/grid5000/sites/lyon/network_equipments/{gw-lyon.json => gw.json} (82%)
 rename data/grid5000/sites/nancy/network_equipments/{gw-nancy.json => gw.json} (74%)
 rename data/grid5000/sites/nantes/network_equipments/{gw-nantes.json => gw.json} (69%)
 rename data/grid5000/sites/rennes/network_equipments/{gw-rennes.json => gw.json} (72%)
 delete mode 100644 data/grid5000/sites/sophia/network_equipments/edgeiron.json
 rename data/grid5000/sites/sophia/network_equipments/{gw-sophia.json => gw.json} (71%)
 delete mode 100644 input/grid5000/sites/nancy/networks/net-links.yaml
 delete mode 100644 input/grid5000/sites/nantes/networks/net-links.yaml
 delete mode 100644 input/grid5000/sites/sophia/networks/edgeiron.yaml

diff --git a/data/grid5000/network_equipments/renater-grenoble.json b/data/grid5000/network_equipments/renater-grenoble.json
index b8c0c819ef8..8331af16060 100644
--- a/data/grid5000/network_equipments/renater-grenoble.json
+++ b/data/grid5000/network_equipments/renater-grenoble.json
@@ -16,7 +16,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater-grenoble",
-  "weathermap": {
-  }
+  "uid": "renater-grenoble"
 }
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-lille.json b/data/grid5000/network_equipments/renater-lille.json
index 64e93843896..dfa45dedf7f 100644
--- a/data/grid5000/network_equipments/renater-lille.json
+++ b/data/grid5000/network_equipments/renater-lille.json
@@ -16,7 +16,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater-lille",
-  "weathermap": {
-  }
+  "uid": "renater-lille"
 }
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-luxembourg.json b/data/grid5000/network_equipments/renater-luxembourg.json
index a226b2b798f..9af7e0c65b2 100644
--- a/data/grid5000/network_equipments/renater-luxembourg.json
+++ b/data/grid5000/network_equipments/renater-luxembourg.json
@@ -16,7 +16,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater-luxembourg",
-  "weathermap": {
-  }
+  "uid": "renater-luxembourg"
 }
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-lyon.json b/data/grid5000/network_equipments/renater-lyon.json
index f7776be7faf..0c50462d4d6 100644
--- a/data/grid5000/network_equipments/renater-lyon.json
+++ b/data/grid5000/network_equipments/renater-lyon.json
@@ -25,7 +25,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater-lyon",
-  "weathermap": {
-  }
+  "uid": "renater-lyon"
 }
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-nancy.json b/data/grid5000/network_equipments/renater-nancy.json
index d8acbe27e74..78bb6bccf46 100644
--- a/data/grid5000/network_equipments/renater-nancy.json
+++ b/data/grid5000/network_equipments/renater-nancy.json
@@ -19,7 +19,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater-nancy",
-  "weathermap": {
-  }
+  "uid": "renater-nancy"
 }
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-nantes.json b/data/grid5000/network_equipments/renater-nantes.json
index 047dab1f5e0..59b515d3bb7 100644
--- a/data/grid5000/network_equipments/renater-nantes.json
+++ b/data/grid5000/network_equipments/renater-nantes.json
@@ -19,7 +19,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater-nantes",
-  "weathermap": {
-  }
+  "uid": "renater-nantes"
 }
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-paris.json b/data/grid5000/network_equipments/renater-paris.json
index 7fcb326a491..7ef133bf3e8 100644
--- a/data/grid5000/network_equipments/renater-paris.json
+++ b/data/grid5000/network_equipments/renater-paris.json
@@ -17,7 +17,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater-paris",
-  "weathermap": {
-  }
+  "uid": "renater-paris"
 }
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-rennes.json b/data/grid5000/network_equipments/renater-rennes.json
index c5835866f56..7581488bdfa 100644
--- a/data/grid5000/network_equipments/renater-rennes.json
+++ b/data/grid5000/network_equipments/renater-rennes.json
@@ -16,7 +16,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater-rennes",
-  "weathermap": {
-  }
+  "uid": "renater-rennes"
 }
\ No newline at end of file
diff --git a/data/grid5000/network_equipments/renater-sophia.json b/data/grid5000/network_equipments/renater-sophia.json
index 47aa61b9150..a5128035f08 100644
--- a/data/grid5000/network_equipments/renater-sophia.json
+++ b/data/grid5000/network_equipments/renater-sophia.json
@@ -16,7 +16,5 @@
     }
   ],
   "type": "network_equipment",
-  "uid": "renater-sophia",
-  "weathermap": {
-  }
+  "uid": "renater-sophia"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json
index ac7638eb43c..65e066db624 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw.json
@@ -1,241 +1,282 @@
 {
   "alias": [
-    "sw-imag"
+    "sw-imag",
+    "gw-grenoble"
   ],
   "backplane_bps": 800000000000,
+  "ip": "172.16.31.254",
   "kind": "router",
   "linecards": [
     {
       "backplane_bps": 48000000000,
       "kavlan_pattern": "%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 1",
           "uid": "dahu-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 2",
           "uid": "dahu-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 3",
           "uid": "dahu-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 4",
           "uid": "dahu-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 5",
           "uid": "dahu-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 6",
           "uid": "dahu-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 7",
           "uid": "dahu-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 8",
           "uid": "dahu-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 9",
           "uid": "dahu-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 10",
           "uid": "dahu-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 11",
           "uid": "dahu-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 12",
           "uid": "dahu-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 13",
           "uid": "dahu-13"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 14",
           "uid": "dahu-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 15",
           "uid": "dahu-15"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 16",
           "uid": "dahu-16"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 17",
           "uid": "dahu-17"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 18",
           "uid": "dahu-18"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 19",
           "uid": "dahu-19"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 20",
           "uid": "dahu-20"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 21",
           "uid": "dahu-21"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 22",
           "uid": "dahu-22"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 23",
           "uid": "dahu-23"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 24",
           "uid": "dahu-24"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 25",
           "uid": "dahu-25"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 26",
           "uid": "dahu-26"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 27",
           "uid": "dahu-27"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 28",
           "uid": "dahu-28"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 29",
           "uid": "dahu-29"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 30",
           "uid": "dahu-30"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 31",
           "uid": "dahu-31"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 32",
           "uid": "dahu-32"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 33",
           "uid": "yeti-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 34",
           "uid": "yeti-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 35",
           "uid": "yeti-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 36",
           "uid": "yeti-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 37",
           "uid": "troll-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 38",
           "uid": "troll-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 39",
           "uid": "troll-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "X670V-48x Port 40",
           "uid": "troll-4"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "X670V-48x Port 41",
           "uid": "dighyp1"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "X670V-48x Port 42",
           "uid": "dighyp2"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "X670V-48x Port 43",
           "uid": "digsed"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "X670V-48x Port 44",
           "uid": "digsed"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "X670V-48x Port 45",
           "uid": "digwatt"
         },
         {
@@ -243,8 +284,8 @@
         {
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "backbone",
+          "snmp_name": "X670V-48x Port 48",
           "uid": "renater5"
         }
       ],
@@ -253,12 +294,7 @@
     }
   ],
   "model": "ExtremeNetworks",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "grenoble",
   "snmp_community": "public",
   "type": "network_equipment",
@@ -341,7 +377,5 @@
       "name": "kavlan-11"
     }
   },
-  "warranty": "expired",
-  "weathermap": {
-  }
+  "warranty": "expired"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
index 72b9dfadc50..85793b2ffee 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-1.json
@@ -1,5 +1,14 @@
 {
   "backplane_bps": 36000000000000,
+  "channels": {
+    "port-channel1": {
+      "kind": "router",
+      "port": "port-channel1",
+      "rate": 200000000000,
+      "uid": "sw-chiclet-2"
+    }
+  },
+  "ip": "172.17.47.221",
   "kind": "switch",
   "linecards": [
     {
@@ -7,168 +16,200 @@
     {
       "backplane_bps": 36000000000000,
       "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
-      "kind": "virtual",
+      "kind": "node",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/1",
           "uid": "chifflot-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/2",
           "uid": "chifflot-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/3",
           "uid": "chifflot-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/4",
           "uid": "chifflot-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/5",
           "uid": "chifflot-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/6",
           "uid": "chifflot-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/7",
           "uid": "chifflot-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/8",
           "uid": "chifflot-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/9",
           "uid": "chiclet-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/10",
           "uid": "chiclet-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/11",
           "uid": "chiclet-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/12",
           "uid": "chiclet-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/13",
           "uid": "chiclet-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/14",
           "uid": "chiclet-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/15",
           "uid": "chiclet-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/16",
           "uid": "chiclet-8"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/17",
           "uid": "chifflot-1"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/18",
           "uid": "chifflot-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/19",
           "uid": "chifflot-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/20",
           "uid": "chifflot-4"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/21",
           "uid": "chifflot-5"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/22",
           "uid": "chifflot-6"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/23",
           "uid": "chifflot-7"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/24",
           "uid": "chifflot-8"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/25",
           "uid": "chiclet-1"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/26",
           "uid": "chiclet-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/27",
           "uid": "chiclet-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/28",
           "uid": "chiclet-4"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/29",
           "uid": "chiclet-5"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/30",
           "uid": "chiclet-6"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/31",
           "uid": "chiclet-7"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/32",
           "uid": "chiclet-8"
         },
         {
@@ -212,18 +253,16 @@
         {
         },
         {
-          "aggregation": "lacp",
-          "kind": "router",
-          "port": "Ethernet1/52",
+          "kind": "channel",
           "rate": 100000000000,
-          "uid": "sw-chiclet-2"
+          "snmp_name": "Ethernet1/53",
+          "uid": "port-channel1"
         },
         {
-          "aggregation": "lacp",
-          "kind": "router",
-          "port": "Ethernet1/51",
+          "kind": "channel",
           "rate": 100000000000,
-          "uid": "sw-chiclet-2"
+          "snmp_name": "Ethernet1/54",
+          "uid": "port-channel1"
         }
       ],
       "rate": 25000000000,
@@ -231,17 +270,10 @@
     }
   ],
   "model": "cisco 93180YC-EX",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "lille",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "sw-chiclet-1",
-  "warranty": "2021-11-30",
-  "weathermap": {
-  }
+  "warranty": "2021-11-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
index 5cc77854efe..714c2dfb236 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-2.json
@@ -1,5 +1,30 @@
 {
+  "alias": [
+    {
+      "ip": "172.16.47.254",
+      "name": "gw"
+    },
+    {
+      "ip": "172.17.47.254",
+      "name": "gw-adm"
+    }
+  ],
   "backplane_bps": 36000000000000,
+  "channels": {
+    "port-channel1": {
+      "kind": "switch",
+      "port": "port-channel1",
+      "rate": 200000000000,
+      "uid": "sw-chiclet-1"
+    },
+    "port-channel2": {
+      "kind": "switch",
+      "port": "port-channel1",
+      "rate": 200000000000,
+      "uid": "sw-chiclet-3"
+    }
+  },
+  "ip": "172.17.47.222",
   "kind": "router",
   "linecards": [
     {
@@ -7,8 +32,7 @@
     {
       "backplane_bps": 36000000000000,
       "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
-      "kind": "virtual",
-      "port": "eth0",
+      "kind": "other",
       "ports": [
         {
         },
@@ -77,15 +101,16 @@
         {
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "backbone",
+          "snmp_name": "Ethernet1/33",
           "uid": "renater5-FON"
         },
         {
         },
         {
           "kind": "other",
-          "port": "eth0",
+          "rate": 1000000000,
+          "snmp_name": "Ethernet1/35",
           "uid": "labo"
         },
         {
@@ -119,32 +144,28 @@
         {
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/54",
+          "kind": "channel",
           "rate": 100000000000,
-          "uid": "sw-chiclet-1"
+          "snmp_name": "Ethernet1/51",
+          "uid": "port-channel1"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/53",
+          "kind": "channel",
           "rate": 100000000000,
-          "uid": "sw-chiclet-1"
+          "snmp_name": "Ethernet1/52",
+          "uid": "port-channel1"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/53",
+          "kind": "channel",
           "rate": 100000000000,
-          "uid": "sw-chiclet-3"
+          "snmp_name": "Ethernet1/53",
+          "uid": "port-channel2"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/54",
+          "kind": "channel",
           "rate": 100000000000,
-          "uid": "sw-chiclet-3"
+          "snmp_name": "Ethernet1/54",
+          "uid": "port-channel2"
         }
       ],
       "rate": 10000000000,
@@ -152,12 +173,7 @@
     }
   ],
   "model": "cisco 93180YC-EX",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "lille",
   "snmp_community": "public",
   "type": "network_equipment",
@@ -240,7 +256,5 @@
       "name": "kavlan-12"
     }
   },
-  "warranty": "2021-11-30",
-  "weathermap": {
-  }
+  "warranty": "2021-11-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json b/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
index 25324ae44ce..1acefc2852e 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-chiclet-3.json
@@ -1,5 +1,14 @@
 {
   "backplane_bps": 36000000000000,
+  "channels": {
+    "port-channel1": {
+      "kind": "router",
+      "port": "port-channel2",
+      "rate": 200000000000,
+      "uid": "sw-chiclet-2"
+    }
+  },
+  "ip": "172.17.47.223",
   "kind": "switch",
   "linecards": [
     {
@@ -7,83 +16,98 @@
     {
       "backplane_bps": 36000000000000,
       "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
-      "kind": "virtual",
+      "kind": "node",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/1",
           "uid": "chetemi-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/2",
           "uid": "chetemi-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/3",
           "uid": "chetemi-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/4",
           "uid": "chetemi-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/5",
           "uid": "chetemi-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/6",
           "uid": "chetemi-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/7",
           "uid": "chetemi-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/8",
           "uid": "chetemi-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/9",
           "uid": "chetemi-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/10",
           "uid": "chetemi-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/11",
           "uid": "chetemi-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/12",
           "uid": "chetemi-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/13",
           "uid": "chetemi-13"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/14",
           "uid": "chetemi-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/15",
           "uid": "chetemi-15"
         },
         {
@@ -91,156 +115,187 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/17",
           "uid": "chifflet-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/18",
           "uid": "chifflet-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/19",
           "uid": "chifflet-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/20",
           "uid": "chifflet-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/21",
           "uid": "chifflet-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/22",
           "uid": "chifflet-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/23",
           "uid": "chifflet-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/24",
           "uid": "chifflet-8"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/25",
           "uid": "chetemi-1"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/26",
           "uid": "chetemi-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/27",
           "uid": "chetemi-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/28",
           "uid": "chetemi-4"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/29",
           "uid": "chetemi-5"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/30",
           "uid": "chetemi-6"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/31",
           "uid": "chetemi-7"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/32",
           "uid": "chetemi-8"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/33",
           "uid": "chetemi-9"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/34",
           "uid": "chetemi-10"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/35",
           "uid": "chetemi-11"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/36",
           "uid": "chetemi-12"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/37",
           "uid": "chetemi-13"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/38",
           "uid": "chetemi-14"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/39",
           "uid": "chetemi-15"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/40",
           "uid": "chifflet-1"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/41",
           "uid": "chifflet-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/42",
           "uid": "chifflet-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/43",
           "uid": "chifflet-4"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/44",
           "uid": "chifflet-5"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/45",
           "uid": "chifflet-6"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/46",
           "uid": "chifflet-7"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/47",
           "uid": "chifflet-8"
         },
         {
@@ -254,18 +309,16 @@
         {
         },
         {
-          "aggregation": "lacp",
-          "kind": "router",
-          "port": "Ethernet1/53",
+          "kind": "channel",
           "rate": 100000000000,
-          "uid": "sw-chiclet-2"
+          "snmp_name": "Ethernet1/53",
+          "uid": "port-channel1"
         },
         {
-          "aggregation": "lacp",
-          "kind": "router",
-          "port": "Ethernet1/54",
+          "kind": "channel",
           "rate": 100000000000,
-          "uid": "sw-chiclet-2"
+          "snmp_name": "Ethernet1/54",
+          "uid": "port-channel1"
         }
       ],
       "rate": 10000000000,
@@ -273,17 +326,10 @@
     }
   ],
   "model": "cisco 93180YC-EX",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "lille",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "sw-chiclet-3",
-  "warranty": "2021-11-30",
-  "weathermap": {
-  }
+  "warranty": "2021-11-30"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
index 53e955a4107..c953f3bdb1f 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-12.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "granduc-12.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/12",
       "vendor": "Broadcom"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "granduc-12-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/24",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
index 549b0a7dbcb..f815317cfd0 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-15.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "granduc-15.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/15",
       "vendor": "Broadcom"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "granduc-15-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/27",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
index dacdc97920f..38f9279e78e 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-16.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "granduc-16.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/16",
       "vendor": "Broadcom"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "granduc-16-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/28",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
index a5c924a7c9a..54b8f07cbe7 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-18.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "granduc-18.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/18",
       "vendor": "Broadcom"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "granduc-18-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/30",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
index 301326c39ee..778715150d6 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-2.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "granduc-2.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/2",
       "vendor": "Broadcom"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "granduc-2-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet1/25",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
index 9a3bb73f8f0..027f44bc836 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-20.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "granduc-20.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/20",
       "vendor": "Broadcom"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "granduc-20-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/32",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
index 09766a73006..7ed83019492 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-21.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "granduc-21.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/21",
       "vendor": "Broadcom"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "granduc-21-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/33",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
index 723ac00254a..a4e6b6302c9 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-3.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "granduc-3.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/3",
       "vendor": "Broadcom"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "granduc-3-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet1/26",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
index 0cac1a7d30a..f9120920b01 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-4.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "granduc-4.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/4",
       "vendor": "Broadcom"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "granduc-4-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet1/27",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
index 71e386bd578..dd0905b3143 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-6.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "granduc-6.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/6",
       "vendor": "Broadcom"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "granduc-6-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet1/29",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
index 255b5b35f21..fe9005d0126 100644
--- a/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
+++ b/data/grid5000/sites/luxembourg/clusters/granduc/nodes/granduc-9.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "granduc-9.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet2/9",
       "vendor": "Broadcom"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "granduc-9-eth1.luxembourg.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-luxembourg",
+      "switch": "gw",
       "switch_port": "GigabitEthernet1/32",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json b/data/grid5000/sites/luxembourg/network_equipments/gw.json
similarity index 76%
rename from data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json
rename to data/grid5000/sites/luxembourg/network_equipments/gw.json
index c2b40161976..f2860d0bee0 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/gw.json
@@ -1,5 +1,17 @@
 {
+  "alias": [
+    "gw-luxembourg"
+  ],
   "backplane_bps": 720000000000,
+  "channels": {
+    "Port-channel4": {
+      "kind": "switch",
+      "port": "port-channel4",
+      "rate": 20000000000,
+      "uid": "ul-grid5000-sw02"
+    }
+  },
+  "ip": "172.16.191.254",
   "kind": "router",
   "linecards": [
     {
@@ -62,16 +74,19 @@
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "GigabitEthernet1/25",
           "uid": "granduc-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "GigabitEthernet1/26",
           "uid": "granduc-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "GigabitEthernet1/27",
           "uid": "granduc-4"
         },
         {
@@ -79,6 +94,7 @@
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "GigabitEthernet1/29",
           "uid": "granduc-6"
         },
         {
@@ -88,6 +104,7 @@
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "GigabitEthernet1/32",
           "uid": "granduc-9"
         },
         {
@@ -95,28 +112,28 @@
         {
         },
         {
-          "kind": "other",
-          "port": "eth1",
-          "uid": "cronos"
+          "kind": "server",
+          "snmp_name": "GigabitEthernet1/35",
+          "uid": "cronos-eth1"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "GigabitEthernet1/36",
           "uid": "zeus"
         },
         {
-          "kind": "other",
-          "port": "eth2",
-          "uid": "cronos"
+          "kind": "server",
+          "snmp_name": "GigabitEthernet1/37",
+          "uid": "cronos-eth2"
         },
         {
         },
         {
         },
         {
-          "kind": "other",
-          "port": "eth1",
-          "uid": "zeus"
+          "kind": "server",
+          "snmp_name": "GigabitEthernet1/40",
+          "uid": "zeus-eth1"
         },
         {
         },
@@ -150,16 +167,19 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet2/2",
           "uid": "granduc-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet2/3",
           "uid": "granduc-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet2/4",
           "uid": "granduc-4"
         },
         {
@@ -167,6 +187,7 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet2/6",
           "uid": "granduc-6"
         },
         {
@@ -176,6 +197,7 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet2/9",
           "uid": "granduc-9"
         },
         {
@@ -185,6 +207,7 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet2/12",
           "uid": "granduc-12"
         },
         {
@@ -194,11 +217,13 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet2/15",
           "uid": "granduc-15"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet2/16",
           "uid": "granduc-16"
         },
         {
@@ -206,6 +231,7 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet2/18",
           "uid": "granduc-18"
         },
         {
@@ -213,11 +239,13 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet2/20",
           "uid": "granduc-20"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet2/21",
           "uid": "granduc-21"
         },
         {
@@ -227,6 +255,7 @@
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "GigabitEthernet2/24",
           "uid": "granduc-12"
         },
         {
@@ -236,11 +265,13 @@
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "GigabitEthernet2/27",
           "uid": "granduc-15"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "GigabitEthernet2/28",
           "uid": "granduc-16"
         },
         {
@@ -248,6 +279,7 @@
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "GigabitEthernet2/30",
           "uid": "granduc-18"
         },
         {
@@ -255,11 +287,13 @@
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "GigabitEthernet2/32",
           "uid": "granduc-20"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "GigabitEthernet2/33",
           "uid": "granduc-21"
         },
         {
@@ -283,8 +317,8 @@
         {
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "GigabitEthernet2/44",
           "uid": "cronos"
         },
         {
@@ -302,21 +336,19 @@
     {
       "backplane_bps": 40000000000,
       "kavlan_pattern": "Ti%LINECARD%/%PORT%",
-      "kind": "switch",
+      "kind": "channel",
       "ports": [
         {
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/30",
-          "uid": "ul-grid5000-sw02"
+          "kind": "channel",
+          "snmp_name": "TenGigabitEthernet3/1",
+          "uid": "Port-channel4"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/32",
-          "uid": "ul-grid5000-sw02"
+          "kind": "channel",
+          "snmp_name": "TenGigabitEthernet3/2",
+          "uid": "Port-channel4"
         }
       ],
       "rate": 10000000000,
@@ -327,7 +359,7 @@
     {
       "backplane_bps": 40000000000,
       "kavlan_pattern": "Ti%LINECARD%/%PORT%",
-      "kind": "virtual",
+      "kind": "backbone",
       "ports": [
         {
         },
@@ -338,8 +370,9 @@
         {
         },
         {
-          "kind": "virtual",
+          "kind": "backbone",
           "rate": 10000000000,
+          "snmp_name": "TenGigabitEthernet5/4",
           "uid": "renater-luxembourg"
         }
       ],
@@ -348,16 +381,11 @@
     }
   ],
   "model": "cisco WS-C6506-E",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "luxembourg",
   "snmp_community": "public",
   "type": "network_equipment",
-  "uid": "gw-luxembourg",
+  "uid": "gw",
   "vlans": {
     "vlan100": {
       "addresses": [
@@ -446,7 +474,5 @@
       "name": "kavlan-20"
     }
   },
-  "warranty": "2018-12-01",
-  "weathermap": {
-  }
+  "warranty": "2018-12-01"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/network_equipments/mxl1.json b/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
index c39ecbec10f..c44f9d01129 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
@@ -1,5 +1,17 @@
 {
+  "alias": [
+    "m1000-mxl1"
+  ],
   "backplane_bps": 1407374880000,
+  "channels": {
+    "Port-channel 5": {
+      "kind": "switch",
+      "port": "port-channel5",
+      "rate": 4000000000,
+      "uid": "ul-grid5000-sw02"
+    }
+  },
+  "ip": "172.17.191.251",
   "kind": "switch",
   "linecards": [
     {
@@ -11,56 +23,67 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/1",
           "uid": "petitprince-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/2",
           "uid": "petitprince-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/3",
           "uid": "petitprince-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/4",
           "uid": "petitprince-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/5",
           "uid": "petitprince-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/6",
           "uid": "petitprince-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/7",
           "uid": "petitprince-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/8",
           "uid": "petitprince-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/9",
           "uid": "petitprince-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/10",
           "uid": "petitprince-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/11",
           "uid": "petitprince-11"
         },
         {
@@ -68,21 +91,25 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/13",
           "uid": "petitprince-13"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/14",
           "uid": "petitprince-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/15",
           "uid": "petitprince-15"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/16",
           "uid": "petitprince-16"
         },
         {
@@ -118,28 +145,24 @@
         {
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/33",
-          "uid": "ul-grid5000-sw02"
+          "kind": "channel",
+          "snmp_name": "TenGigabitEthernet 0/33",
+          "uid": "Port-channel 5"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/34",
-          "uid": "ul-grid5000-sw02"
+          "kind": "channel",
+          "snmp_name": "TenGigabitEthernet 0/34",
+          "uid": "Port-channel 5"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/35",
-          "uid": "ul-grid5000-sw02"
+          "kind": "channel",
+          "snmp_name": "TenGigabitEthernet 0/35",
+          "uid": "Port-channel 5"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/36",
-          "uid": "ul-grid5000-sw02"
+          "kind": "channel",
+          "snmp_name": "TenGigabitEthernet 0/36",
+          "uid": "Port-channel 5"
         }
       ],
       "rate": 10000000000,
@@ -147,26 +170,10 @@
     }
   ],
   "model": "Force10 MXL",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "luxembourg",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "mxl1",
-  "vlans": {
-    "vlan101": {
-      "addresses": [
-        "172.17.191.251"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "expired",
-  "weathermap": {
-    "use_cacti": "yes"
-  }
+  "warranty": "expired"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/network_equipments/mxl2.json b/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
index e9e7ffebcf3..dd9dee67331 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
@@ -1,5 +1,17 @@
 {
+  "alias": [
+    "m1000-mxl2"
+  ],
   "backplane_bps": 1407374880000,
+  "channels": {
+    "Port-channel 6": {
+      "kind": "switch",
+      "port": "port-channel6",
+      "rate": 4000000000,
+      "uid": "ul-grid5000-sw02"
+    }
+  },
+  "ip": "172.17.191.252",
   "kind": "switch",
   "linecards": [
     {
@@ -11,56 +23,67 @@
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/1",
           "uid": "petitprince-1"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/2",
           "uid": "petitprince-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/3",
           "uid": "petitprince-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/4",
           "uid": "petitprince-4"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/5",
           "uid": "petitprince-5"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/6",
           "uid": "petitprince-6"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/7",
           "uid": "petitprince-7"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/8",
           "uid": "petitprince-8"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/9",
           "uid": "petitprince-9"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/10",
           "uid": "petitprince-10"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/11",
           "uid": "petitprince-11"
         },
         {
@@ -68,21 +91,25 @@
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/13",
           "uid": "petitprince-13"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/14",
           "uid": "petitprince-14"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/15",
           "uid": "petitprince-15"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/16",
           "uid": "petitprince-16"
         },
         {
@@ -118,28 +145,24 @@
         {
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/37",
-          "uid": "ul-grid5000-sw02"
+          "kind": "channel",
+          "snmp_name": "TenGigabitEthernet 0/33",
+          "uid": "Port-channel 6"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/38",
-          "uid": "ul-grid5000-sw02"
+          "kind": "channel",
+          "snmp_name": "TenGigabitEthernet 0/34",
+          "uid": "Port-channel 6"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/39",
-          "uid": "ul-grid5000-sw02"
+          "kind": "channel",
+          "snmp_name": "TenGigabitEthernet 0/35",
+          "uid": "Port-channel 6"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/40",
-          "uid": "ul-grid5000-sw02"
+          "kind": "channel",
+          "snmp_name": "TenGigabitEthernet 0/36",
+          "uid": "Port-channel 6"
         }
       ],
       "rate": 10000000000,
@@ -147,26 +170,10 @@
     }
   ],
   "model": "Force10 MXL",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "luxembourg",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "mxl2",
-  "vlans": {
-    "vlan101": {
-      "addresses": [
-        "172.17.191.252"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "expired",
-  "weathermap": {
-    "use_cacti": "yes"
-  }
+  "warranty": "expired"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
index 59b7334db58..8300d3bd44a 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
@@ -1,5 +1,32 @@
 {
   "backplane_bps": 1040000000000,
+  "channels": {
+    "port-channel4": {
+      "kind": "router",
+      "port": "Port-channel4",
+      "rate": 20000000000,
+      "uid": "gw"
+    },
+    "port-channel5": {
+      "kind": "switch",
+      "port": "Port-channel 5",
+      "rate": 40000000000,
+      "uid": "mxl1"
+    },
+    "port-channel6": {
+      "kind": "switch",
+      "port": "Port-channel 6",
+      "rate": 40000000000,
+      "uid": "mxl2"
+    },
+    "port-channel7": {
+      "kind": "server",
+      "port": "NA",
+      "rate": 20000000000,
+      "uid": "srv-data"
+    }
+  },
+  "ip": "172.17.191.253",
   "kind": "switch",
   "linecards": [
     {
@@ -17,16 +44,19 @@
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet1/3",
           "uid": "granduc-2"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet1/4",
           "uid": "granduc-3"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet1/5",
           "uid": "granduc-4"
         },
         {
@@ -34,6 +64,7 @@
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet1/7",
           "uid": "granduc-6"
         },
         {
@@ -43,6 +74,7 @@
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet1/10",
           "uid": "granduc-9"
         },
         {
@@ -52,6 +84,7 @@
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet1/13",
           "uid": "granduc-12"
         },
         {
@@ -61,11 +94,13 @@
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet1/16",
           "uid": "granduc-15"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet1/17",
           "uid": "granduc-16"
         },
         {
@@ -73,6 +108,7 @@
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet1/19",
           "uid": "granduc-18"
         },
         {
@@ -80,11 +116,13 @@
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet1/21",
           "uid": "granduc-20"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet1/22",
           "uid": "granduc-21"
         },
         {
@@ -92,8 +130,14 @@
         {
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/25",
+          "uid": "port-channel7"
         },
         {
+          "kind": "channel",
+          "snmp_name": "Ethernet1/26",
+          "uid": "port-channel7"
         },
         {
         },
@@ -102,66 +146,56 @@
         {
         },
         {
-          "aggregation": "lacp",
-          "kind": "router",
-          "port": "Te3/1",
-          "uid": "gw-luxembourg"
+          "kind": "channel",
+          "snmp_name": "Ethernet1/30",
+          "uid": "port-channel4"
         },
         {
         },
         {
-          "aggregation": "lacp",
-          "kind": "router",
-          "port": "Te3/2",
-          "uid": "gw-luxembourg"
+          "kind": "channel",
+          "snmp_name": "Ethernet1/32",
+          "uid": "port-channel4"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Te0/33",
-          "uid": "mxl1"
+          "kind": "channel",
+          "snmp_name": "Ethernet1/33",
+          "uid": "port-channel5"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Te0/34",
-          "uid": "mxl1"
+          "kind": "channel",
+          "snmp_name": "Ethernet1/34",
+          "uid": "port-channel5"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Te0/35",
-          "uid": "mxl1"
+          "kind": "channel",
+          "snmp_name": "Ethernet1/35",
+          "uid": "port-channel5"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Te0/36",
-          "uid": "mxl1"
+          "kind": "channel",
+          "snmp_name": "Ethernet1/36",
+          "uid": "port-channel5"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Te0/33",
-          "uid": "mxl2"
+          "kind": "channel",
+          "snmp_name": "Ethernet1/37",
+          "uid": "port-channel6"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Te0/34",
-          "uid": "mxl2"
+          "kind": "channel",
+          "snmp_name": "Ethernet1/38",
+          "uid": "port-channel6"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Te0/35",
-          "uid": "mxl2"
+          "kind": "channel",
+          "snmp_name": "Ethernet1/39",
+          "uid": "port-channel6"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Te0/36",
-          "uid": "mxl2"
+          "kind": "channel",
+          "snmp_name": "Ethernet1/40",
+          "uid": "port-channel6"
         }
       ],
       "rate": 10000000000,
@@ -169,26 +203,10 @@
     }
   ],
   "model": "cisco N5K-C5020P-BF",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "luxembourg",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "ul-grid5000-sw02",
-  "vlans": {
-    "vlan101": {
-      "addresses": [
-        "172.17.191.253"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "expired",
-  "weathermap": {
-    "use_cacti": "yes"
-  }
+  "warranty": "expired"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
index da02977b890..62e58cf8dc2 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
@@ -136,7 +136,7 @@
       "name": "enp1s0f0",
       "network_address": "gemini-1.lyon.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-lyon",
+      "switch": "gw",
       "switch_port": "ethernet1/1/1",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
index f32ac42f972..2172eb717d1 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
@@ -136,7 +136,7 @@
       "name": "enp1s0f0",
       "network_address": "gemini-2.lyon.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-lyon",
+      "switch": "gw",
       "switch_port": "ethernet1/1/2",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/lyon/network_equipments/force10.json b/data/grid5000/sites/lyon/network_equipments/force10.json
index ecef64440f9..c1017411005 100644
--- a/data/grid5000/sites/lyon/network_equipments/force10.json
+++ b/data/grid5000/sites/lyon/network_equipments/force10.json
@@ -1,87 +1,108 @@
 {
+  "alias": [
+    "force10-adm",
+    "staurus",
+    "sorion",
+    "shercule"
+  ],
   "backplane_bps": 1280000000000,
+  "ip": "172.17.63.253",
   "kind": "switch",
   "linecards": [
     {
       "kavlan_pattern": "%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/1",
           "uid": "taurus-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/2",
           "uid": "taurus-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/3",
           "uid": "taurus-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/4",
           "uid": "taurus-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/5",
           "uid": "taurus-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/6",
           "uid": "taurus-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/7",
           "uid": "taurus-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/8",
           "uid": "taurus-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/9",
           "uid": "taurus-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/10",
           "uid": "taurus-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/11",
           "uid": "taurus-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/12",
           "uid": "taurus-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/13",
           "uid": "taurus-13"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/14",
           "uid": "taurus-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/15",
           "uid": "taurus-15"
         },
         {
@@ -89,171 +110,202 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/17",
           "uid": "orion-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/18",
           "uid": "orion-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/19",
           "uid": "orion-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/20",
           "uid": "orion-4"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/21",
           "uid": "hercule-1"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/22",
           "uid": "hercule-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/23",
           "uid": "hercule-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 0/24",
           "uid": "hercule-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/25",
           "uid": "nova-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/26",
           "uid": "nova-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/27",
           "uid": "nova-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/28",
           "uid": "nova-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/29",
           "uid": "nova-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/30",
           "uid": "nova-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/31",
           "uid": "nova-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/32",
           "uid": "nova-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/33",
           "uid": "nova-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/34",
           "uid": "nova-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/35",
           "uid": "nova-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/36",
           "uid": "nova-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/37",
           "uid": "nova-13"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/38",
           "uid": "nova-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/39",
           "uid": "nova-15"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/40",
           "uid": "nova-16"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/41",
           "uid": "nova-17"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/42",
           "uid": "nova-18"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/43",
           "uid": "nova-19"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/44",
           "uid": "nova-20"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/45",
           "uid": "nova-21"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/46",
           "uid": "nova-22"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/47",
           "uid": "nova-23"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "TenGigabitEthernet 0/48",
           "uid": "castor"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "TenGigabitEthernet 0/49",
           "uid": "pollux"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "TenGigabitEthernet 0/50",
           "uid": "procyon"
         },
         {
@@ -277,7 +329,8 @@
         {
           "kind": "router",
           "port": "0:25",
-          "uid": "gw-lyon"
+          "snmp_name": "fortyGigE 0/60",
+          "uid": "gw"
         }
       ],
       "rate": 10000000000,
@@ -285,26 +338,11 @@
     }
   ],
   "model": "Force10 S4810",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "serial": "FGSN9T1",
   "site": "lyon",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "force10",
-  "vlans": {
-    "vlan101": {
-      "addresses": [
-        "172.17.63.253"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "2017-07-01",
-  "weathermap": {
-  }
+  "warranty": "2017-07-01"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/network_equipments/gw-lyon.json b/data/grid5000/sites/lyon/network_equipments/gw.json
similarity index 82%
rename from data/grid5000/sites/lyon/network_equipments/gw-lyon.json
rename to data/grid5000/sites/lyon/network_equipments/gw.json
index b0803b88ee0..c9e4c13a247 100644
--- a/data/grid5000/sites/lyon/network_equipments/gw-lyon.json
+++ b/data/grid5000/sites/lyon/network_equipments/gw.json
@@ -1,5 +1,11 @@
 {
+  "alias": [
+    "gw-lyon",
+    "router",
+    "sgemini"
+  ],
   "backplane_bps": 960000000000,
+  "ip": "172.16.63.254",
   "kind": "router",
   "linecards": [
     {
@@ -7,18 +13,19 @@
     {
       "kavlan_pattern": "%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet1/1/1",
           "uid": "gemini-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet1/1/2",
           "uid": "gemini-2"
         },
         {
@@ -56,23 +63,24 @@
         {
         },
         {
-          "kind": "other",
-          "port": "eno1",
+          "kind": "server",
+          "snmp_name": "ethernet1/1/20",
           "uid": "albireo-a"
         },
         {
-          "kind": "other",
-          "port": "eno1",
+          "kind": "server",
+          "snmp_name": "ethernet1/1/21",
           "uid": "albireo-b"
         },
         {
-          "kind": "other",
-          "port": "ens3f1",
+          "kind": "server",
+          "snmp_name": "ethernet1/1/22",
           "uid": "alcor"
         },
         {
           "kind": "switch",
           "port": "2",
+          "snmp_name": "ethernet1/1/23",
           "uid": "salome"
         },
         {
@@ -80,6 +88,7 @@
         {
           "kind": "switch",
           "port": "0:60",
+          "snmp_name": "ethernet1/1/25",
           "uid": "force10"
         },
         {
@@ -91,9 +100,8 @@
         {
         },
         {
-          "kind": "virtual",
-          "port": "eth0",
-          "site": "renater",
+          "kind": "backbone",
+          "snmp_name": "ethernet1/1/30",
           "uid": "renater-lyon"
         }
       ],
@@ -102,17 +110,12 @@
     }
   ],
   "model": "Dell EMC S4128F-ON",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "serial": "J9J1PK2",
   "site": "lyon",
   "snmp_community": "public",
   "type": "network_equipment",
-  "uid": "gw-lyon",
+  "uid": "gw",
   "vlans": {
     "vlan100": {
       "addresses": [
@@ -192,7 +195,5 @@
       "name": "kavlan-13"
     }
   },
-  "warranty": "2024-08-15",
-  "weathermap": {
-  }
+  "warranty": "2024-08-15"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/network_equipments/salome.json b/data/grid5000/sites/lyon/network_equipments/salome.json
index 07441c00bb5..ad0667fc28a 100644
--- a/data/grid5000/sites/lyon/network_equipments/salome.json
+++ b/data/grid5000/sites/lyon/network_equipments/salome.json
@@ -1,5 +1,9 @@
 {
+  "alias": [
+    "ssagittaire"
+  ],
   "backplane_bps": 136000000000,
+  "ip": "172.17.63.250",
   "kind": "switch",
   "linecards": [
     {
@@ -14,13 +18,15 @@
         {
           "kind": "router",
           "port": "0:23",
-          "uid": "gw-lyon"
+          "snmp_name": "ethernet 2",
+          "uid": "gw"
         },
         {
         },
         {
           "kind": "other",
           "port": "eth1",
+          "snmp_name": "ethernet 4",
           "uid": "sw-admin"
         },
         {
@@ -58,111 +64,133 @@
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 21",
           "uid": "sagittaire-1"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 22",
           "uid": "sagittaire-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 23",
           "uid": "sagittaire-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 24",
           "uid": "sagittaire-4"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 25",
           "uid": "sagittaire-5"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 26",
           "uid": "sagittaire-6"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 27",
           "uid": "sagittaire-7"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 28",
           "uid": "sagittaire-11"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 29",
           "uid": "sagittaire-12"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 30",
           "uid": "sagittaire-13"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 31",
           "uid": "sagittaire-14"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 32",
           "uid": "sagittaire-15"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 33",
           "uid": "sagittaire-16"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 34",
           "uid": "sagittaire-17"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 35",
           "uid": "sagittaire-18"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 36",
           "uid": "sagittaire-19"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 37",
           "uid": "sagittaire-20"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 38",
           "uid": "sagittaire-24"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 39",
           "uid": "sagittaire-27"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 40",
           "uid": "sagittaire-29"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 41",
           "uid": "sagittaire-30"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 42",
           "uid": "sagittaire-31"
         }
       ],
@@ -171,26 +199,11 @@
     }
   ],
   "model": "FESX448+2XG-PREM",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "serial": "FL37068284",
   "site": "lyon",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "salome",
-  "vlans": {
-    "vlan101": {
-      "addresses": [
-        "172.17.63.250"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "expired",
-  "weathermap": {
-  }
+  "warranty": "expired"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
index 52e05ec3af4..0fe1a320517 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-1.json
@@ -133,7 +133,7 @@
       "name": "ens4f0",
       "network_address": "graffiti-1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/39",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
index 99aaab94eed..7cc402cc060 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-10.json
@@ -133,7 +133,7 @@
       "name": "ens4f0",
       "network_address": "graffiti-10.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/44",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
index ef8480c5d9b..d4476fe3ad5 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-11.json
@@ -133,7 +133,7 @@
       "name": "ens4f0",
       "network_address": "graffiti-11.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/43",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
index 936aca3d3a7..8092c155d40 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-12.json
@@ -133,7 +133,7 @@
       "name": "ens4f0",
       "network_address": "graffiti-12.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/45",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
index 0132aafe46c..9491a8e0408 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-13.json
@@ -133,7 +133,7 @@
       "name": "ens4f0",
       "network_address": "graffiti-13.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/41",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
index 0a7d98f2acf..ea0bc957ebd 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-2.json
@@ -133,7 +133,7 @@
       "name": "ens4f0",
       "network_address": "graffiti-2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/36",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
index 46f003b7e42..f5054d6f77d 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-3.json
@@ -133,7 +133,7 @@
       "name": "ens4f0",
       "network_address": "graffiti-3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/40",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
index ceff78042a7..5c6bc98f2a0 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-4.json
@@ -133,7 +133,7 @@
       "name": "ens4f0",
       "network_address": "graffiti-4.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/48",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
index 8e965b1be8b..a0218f419eb 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-5.json
@@ -133,7 +133,7 @@
       "name": "ens4f0",
       "network_address": "graffiti-5.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/37",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
index 3113e7dd422..7d81cf0854d 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-6.json
@@ -133,7 +133,7 @@
       "name": "ens4f0",
       "network_address": "graffiti-6.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/38",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
index 5e7a3a55253..c0d95eb8d92 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-7.json
@@ -133,7 +133,7 @@
       "name": "ens4f0",
       "network_address": "graffiti-7.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/35",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
index 0a609d19d6c..b3a8aa42318 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-8.json
@@ -133,7 +133,7 @@
       "name": "ens4f0",
       "network_address": "graffiti-8.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/34",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
index 3b4affe1c74..d245ed87225 100644
--- a/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
+++ b/data/grid5000/sites/nancy/clusters/graffiti/nodes/graffiti-9.json
@@ -133,7 +133,7 @@
       "name": "ens4f0",
       "network_address": "graffiti-9.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/46",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
index 6a9cbfafa0b..f04414c8fcd 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/1",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
index 070ba4353fd..dd9995516fa 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-10.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/10",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
index 97199968a56..cd825b0171f 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-11.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/11",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
index 0cbeb53147c..a40a28f1057 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-12.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/12",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
index 0c719842aa4..e4eff2dc471 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-13.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/13",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
index 20d028505a1..db9918dacea 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-14.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/14",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
index 5ccc07555d1..b6a1bf5d68a 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-15.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/15",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
index 53cc3cc9fad..3910d1119e9 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-16.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/16",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
index 5d1d7af1b32..ee1107f4563 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/2",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
index 77b124dd197..2beb6aa1190 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/3",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
index a732c603a2c..8827ed3547e 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-4.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/4",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
index 54aecc52915..894e54db6fe 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-5.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/5",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
index 5d1165ffe32..11df9be1a9b 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-6.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/6",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
index 53e427044d0..962a2dde414 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-7.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/7",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
index e92efb173fa..bff64786971 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-8.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/8",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
index deb49f82ee1..c56cdc276f2 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "graoully-9.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/9",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
index 972bce04dfb..bd0b47884a2 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-1.json
@@ -83,7 +83,7 @@
       "name": "eno1",
       "network_address": "graphique-1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/25",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
index 15a90b46971..2c8b175c246 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-2.json
@@ -83,7 +83,7 @@
       "name": "eno1",
       "network_address": "graphique-2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/24",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
index c392b38364b..39306425ef9 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-3.json
@@ -83,7 +83,7 @@
       "name": "eno1",
       "network_address": "graphique-3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/23",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
index d01dae5d233..f5e2fdf3679 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-4.json
@@ -83,7 +83,7 @@
       "name": "eno1",
       "network_address": "graphique-4.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/21",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
index e2a80887d9b..f8ec68b1c9c 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-5.json
@@ -83,7 +83,7 @@
       "name": "eno1",
       "network_address": "graphique-5.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/22",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
index dca6e84d88b..9cfd4f6b793 100644
--- a/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
+++ b/data/grid5000/sites/nancy/clusters/graphique/nodes/graphique-6.json
@@ -83,7 +83,7 @@
       "name": "eno1",
       "network_address": "graphique-6.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/26",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
index a04aa2feb1e..5218d4c00cd 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-1.json
@@ -72,7 +72,7 @@
       "name": "eno1",
       "network_address": "graphite-1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/17",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
index 32de29b523e..e092e5ce1e0 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-2.json
@@ -72,7 +72,7 @@
       "name": "eno1",
       "network_address": "graphite-2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/18",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
index 22f6b67d2c7..6683126d246 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-3.json
@@ -72,7 +72,7 @@
       "name": "eno1",
       "network_address": "graphite-3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/19",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
index 53526864681..20422a18c45 100644
--- a/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphite/nodes/graphite-4.json
@@ -72,7 +72,7 @@
       "name": "eno1",
       "network_address": "graphite-4.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/20",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json
index 21de5466f89..f5157186b77 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-1.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-1.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/47",
+      "switch_port": "GigabitEthernet1/0/47",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json
index f50f6c641b2..904ba80a11c 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-10.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-10.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/44",
+      "switch_port": "GigabitEthernet1/0/44",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json
index 60e35dc3e18..80116a68a4a 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-11.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-11.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/5",
+      "switch_port": "GigabitEthernet1/0/5",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json
index 06e91bcb0dd..158f9b334dc 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-12.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-12.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/6",
+      "switch_port": "GigabitEthernet1/0/6",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json
index 4b77134e6dd..fb4728e83c7 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-13.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-13.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/41",
+      "switch_port": "GigabitEthernet1/0/41",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json
index 0c3c4a7657e..a55183dd646 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-14.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-14.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/42",
+      "switch_port": "GigabitEthernet1/0/42",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json
index fcf0bffd401..8b08d996e9d 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-15.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-15.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/7",
+      "switch_port": "GigabitEthernet1/0/7",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json
index 134b4eadbf0..9d871969328 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-16.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-16.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/8",
+      "switch_port": "GigabitEthernet1/0/8",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json
index bd339528419..4e0b65031d8 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-17.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-17.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/39",
+      "switch_port": "GigabitEthernet1/0/39",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json
index d626eb355fa..4ba36aec9d2 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-18.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-18.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/40",
+      "switch_port": "GigabitEthernet1/0/40",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json
index a0339b2e8ed..0514dd47234 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-19.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-19.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/9",
+      "switch_port": "GigabitEthernet1/0/9",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json
index d5af2e5b601..61ef2a3efaa 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-2.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-2.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/48",
+      "switch_port": "GigabitEthernet1/0/48",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json
index f2c6bca82e0..6f87ed8370a 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-20.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-20.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/10",
+      "switch_port": "GigabitEthernet1/0/10",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json
index 252f9e58d55..d185fb05d82 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-21.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-21.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/37",
+      "switch_port": "GigabitEthernet1/0/37",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json
index 049a1ae0f32..0a411fe2d25 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-22.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-22.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/38",
+      "switch_port": "GigabitEthernet1/0/38",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json
index 3c56f50b364..185569ca847 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-23.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-23.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/11",
+      "switch_port": "GigabitEthernet1/0/11",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json
index 453303c52ca..e6a6ded26f8 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-24.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-24.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/12",
+      "switch_port": "GigabitEthernet1/0/12",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json
index 4b42f29ddf7..1a7517e1e69 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-25.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-25.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/35",
+      "switch_port": "GigabitEthernet1/0/35",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json
index 9fcb5ff77b8..03325ea8848 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-26.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-26.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/36",
+      "switch_port": "GigabitEthernet1/0/36",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json
index 8d02c3daa28..2eaf8c80272 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-27.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-27.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/13",
+      "switch_port": "GigabitEthernet1/0/13",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json
index 45a6c8550f5..ac55dd3a001 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-28.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-28.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/14",
+      "switch_port": "GigabitEthernet1/0/14",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json
index ff65a8854e8..08e50be5ba8 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-29.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-29.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/33",
+      "switch_port": "GigabitEthernet1/0/33",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json
index 708ab8960b3..43c589d3529 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-3.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-3.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/1",
+      "switch_port": "GigabitEthernet1/0/1",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json
index b3942fd32b8..ee04d35bbea 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-30.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-30.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/34",
+      "switch_port": "GigabitEthernet1/0/34",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json
index 615a544ce45..21cb7c6ccdf 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-31.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-31.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/15",
+      "switch_port": "GigabitEthernet1/0/15",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json
index 17cfa684f82..e2b4e731d69 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-32.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-32.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/16",
+      "switch_port": "GigabitEthernet1/0/16",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json
index a336e031393..258580e9414 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-33.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-33.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/31",
+      "switch_port": "GigabitEthernet1/0/31",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json
index b7f1df315e4..6c683347f60 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-34.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-34.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/32",
+      "switch_port": "GigabitEthernet1/0/32",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json
index 0fd8d368d61..04ac31c82d0 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-35.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-35.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/17",
+      "switch_port": "GigabitEthernet1/0/17",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json
index 2746ee52f82..feb7d07f761 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-36.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-36.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/18",
+      "switch_port": "GigabitEthernet1/0/18",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json
index 5c09a67dd7f..1bdb65dae4f 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-37.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-37.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/29",
+      "switch_port": "GigabitEthernet1/0/29",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json
index 16f3a7a8b18..a0a568716c1 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-38.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-38.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/30",
+      "switch_port": "GigabitEthernet1/0/30",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json
index 40124720896..d18317e02f2 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-39.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-39.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/19",
+      "switch_port": "GigabitEthernet1/0/19",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json
index 6a267a738a5..1eabd248f68 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-4.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-4.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/2",
+      "switch_port": "GigabitEthernet1/0/2",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json
index 0ee71cabd68..52b13e37e71 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-40.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-40.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/20",
+      "switch_port": "GigabitEthernet1/0/20",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json
index 6ca3b1c3fe5..c9d858217a7 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-41.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-41.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/27",
+      "switch_port": "GigabitEthernet1/0/27",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json
index 6c2135f8350..70892ae16eb 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-42.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-42.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/28",
+      "switch_port": "GigabitEthernet1/0/28",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json
index 174b59a0a52..8d658ec5314 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-43.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-43.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/21",
+      "switch_port": "GigabitEthernet1/0/21",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json
index 3a0dd0e02be..754a4f4a978 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-44.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-44.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/22",
+      "switch_port": "GigabitEthernet1/0/22",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json
index 4891ac2a193..639bf7d1f01 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-45.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-45.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/25",
+      "switch_port": "GigabitEthernet1/0/25",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json
index 67006f9fe6f..a46ea766b9f 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-46.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-46.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/26",
+      "switch_port": "GigabitEthernet1/0/26",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json
index 2ede002927d..4f0457b4f5b 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-47.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-47.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/23",
+      "switch_port": "GigabitEthernet1/0/23",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.json
index b3f6799e782..cce981456ed 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-48.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-48.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/24",
+      "switch_port": "GigabitEthernet1/0/24",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json
index cc857768f6f..3098d7c00a9 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-5.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-5.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/45",
+      "switch_port": "GigabitEthernet1/0/45",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json
index fb89f32a945..0ceb46a3566 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-6.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-6.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/46",
+      "switch_port": "GigabitEthernet1/0/46",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json
index 23746493b76..cbd2de6f09a 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-7.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-7.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/3",
+      "switch_port": "GigabitEthernet1/0/3",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json
index 4597675e2f8..c9b925beed6 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-8.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-8.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/4",
+      "switch_port": "GigabitEthernet1/0/4",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json
index f4049c605e0..3a49f1152c4 100644
--- a/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json
+++ b/data/grid5000/sites/nancy/clusters/grcinq/nodes/grcinq-9.json
@@ -63,7 +63,7 @@
       "network_address": "grcinq-9.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgrcinq",
-      "switch_port": "GigabitEthernet 1/0/43",
+      "switch_port": "GigabitEthernet1/0/43",
       "vendor": "Intel"
     },
     {
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json
index c4948223a39..499cb13de5b 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-1.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "grele-1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/1",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json
index d2770d603c3..e1c5f675784 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-10.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "grele-10.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/10",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json
index 6e76c709bd7..46174b5cbdf 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-11.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "grele-11.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/11",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json
index 64a33ca8731..f232f05d9da 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-12.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "grele-12.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/12",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json
index 0a902054ce7..93ee93a4e46 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-13.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "grele-13.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/13",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json
index 0e350f2ed02..20fcb68c106 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-14.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "grele-14.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/14",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json
index c68c1be5558..b75d714d239 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-2.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "grele-2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/2",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json
index 4f1f5be8467..bd51df05bc4 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-3.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "grele-3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/3",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json
index 960abbbc264..11805906f07 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-4.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "grele-4.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/4",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json
index 09bbf5c3c13..134ca0026cd 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-5.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "grele-5.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/5",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json
index dfd3777b803..417b80fdf29 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-6.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "grele-6.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/6",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json
index f1724786b3b..2d14b954ec2 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-7.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "grele-7.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/7",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json
index 7ea6f846553..eea977b028d 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-8.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "grele-8.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/8",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json
index eeae52d8365..3c48c49a70e 100644
--- a/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json
+++ b/data/grid5000/sites/nancy/clusters/grele/nodes/grele-9.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "grele-9.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/9",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json
index bd5c1000782..b6064200817 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-1.json
@@ -83,7 +83,7 @@
       "name": "eno1",
       "network_address": "grimani-1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/46",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json
index 6843d3e2e59..5ceba43d802 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-2.json
@@ -83,7 +83,7 @@
       "name": "eno1",
       "network_address": "grimani-2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/47",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json
index 31572f8bf1f..3a92a80cad7 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-3.json
@@ -83,7 +83,7 @@
       "name": "eno1",
       "network_address": "grimani-3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/48",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json
index a2f8451601a..b7f691c6bda 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-4.json
@@ -83,7 +83,7 @@
       "name": "eno1",
       "network_address": "grimani-4.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/43",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json
index 738b5e61763..26d3ec7b6f1 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-5.json
@@ -83,7 +83,7 @@
       "name": "eno1",
       "network_address": "grimani-5.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/45",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json
index 76fdb4a2a62..db9a177fcb3 100644
--- a/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json
+++ b/data/grid5000/sites/nancy/clusters/grimani/nodes/grimani-6.json
@@ -83,7 +83,7 @@
       "name": "eno1",
       "network_address": "grimani-6.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/44",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
index 96e5a5814d6..4e38f7acc7f 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
@@ -120,7 +120,7 @@
       "name": "eno1",
       "network_address": "grimoire-1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/41",
       "vendor": "Intel"
     },
@@ -140,7 +140,7 @@
       "name": "eno2",
       "network_address": "grimoire-1-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/41",
       "vendor": "Intel"
     },
@@ -160,7 +160,7 @@
       "name": "enp129s0f0",
       "network_address": "grimoire-1-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/41",
       "vendor": "Intel"
     },
@@ -180,7 +180,7 @@
       "name": "enp129s0f1",
       "network_address": "grimoire-1-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/41",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
index 7fc6307d61b..b5edb9c8f13 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
@@ -120,7 +120,7 @@
       "name": "eno1",
       "network_address": "grimoire-2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/42",
       "vendor": "Intel"
     },
@@ -140,7 +140,7 @@
       "name": "eno2",
       "network_address": "grimoire-2-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/42",
       "vendor": "Intel"
     },
@@ -160,7 +160,7 @@
       "name": "enp129s0f0",
       "network_address": "grimoire-2-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/42",
       "vendor": "Intel"
     },
@@ -180,7 +180,7 @@
       "name": "enp129s0f1",
       "network_address": "grimoire-2-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/42",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
index f7bd0385c02..814a1ea574e 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
@@ -120,7 +120,7 @@
       "name": "eno1",
       "network_address": "grimoire-3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/43",
       "vendor": "Intel"
     },
@@ -140,7 +140,7 @@
       "name": "eno2",
       "network_address": "grimoire-3-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/43",
       "vendor": "Intel"
     },
@@ -160,7 +160,7 @@
       "name": "enp129s0f0",
       "network_address": "grimoire-3-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/43",
       "vendor": "Intel"
     },
@@ -180,7 +180,7 @@
       "name": "enp129s0f1",
       "network_address": "grimoire-3-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/43",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
index eabd0d3cec0..6ad71744108 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
@@ -120,7 +120,7 @@
       "name": "eno1",
       "network_address": "grimoire-4.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/44",
       "vendor": "Intel"
     },
@@ -140,7 +140,7 @@
       "name": "eno2",
       "network_address": "grimoire-4-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/44",
       "vendor": "Intel"
     },
@@ -160,7 +160,7 @@
       "name": "enp129s0f0",
       "network_address": "grimoire-4-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/44",
       "vendor": "Intel"
     },
@@ -180,7 +180,7 @@
       "name": "enp129s0f1",
       "network_address": "grimoire-4-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/44",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
index 6d2e3f3ca72..f65b49f1707 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
@@ -120,7 +120,7 @@
       "name": "eno1",
       "network_address": "grimoire-5.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/45",
       "vendor": "Intel"
     },
@@ -140,7 +140,7 @@
       "name": "eno2",
       "network_address": "grimoire-5-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/45",
       "vendor": "Intel"
     },
@@ -160,7 +160,7 @@
       "name": "enp129s0f0",
       "network_address": "grimoire-5-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/45",
       "vendor": "Intel"
     },
@@ -180,7 +180,7 @@
       "name": "enp129s0f1",
       "network_address": "grimoire-5-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/45",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
index 599c615f672..2f1fc7c086e 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
@@ -120,7 +120,7 @@
       "name": "eno1",
       "network_address": "grimoire-6.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/46",
       "vendor": "Intel"
     },
@@ -140,7 +140,7 @@
       "name": "eno2",
       "network_address": "grimoire-6-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/46",
       "vendor": "Intel"
     },
@@ -160,7 +160,7 @@
       "name": "enp129s0f0",
       "network_address": "grimoire-6-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/46",
       "vendor": "Intel"
     },
@@ -180,7 +180,7 @@
       "name": "enp129s0f1",
       "network_address": "grimoire-6-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/46",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
index 635537d6379..721b84af6d3 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
@@ -120,7 +120,7 @@
       "name": "eno1",
       "network_address": "grimoire-7.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/47",
       "vendor": "Intel"
     },
@@ -140,7 +140,7 @@
       "name": "eno2",
       "network_address": "grimoire-7-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/47",
       "vendor": "Intel"
     },
@@ -160,7 +160,7 @@
       "name": "enp129s0f0",
       "network_address": "grimoire-7-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/47",
       "vendor": "Intel"
     },
@@ -180,7 +180,7 @@
       "name": "enp129s0f1",
       "network_address": "grimoire-7-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/47",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
index f9bc62e9c55..915930b45d0 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
@@ -120,7 +120,7 @@
       "name": "eno1",
       "network_address": "grimoire-8.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/48",
       "vendor": "Intel"
     },
@@ -140,7 +140,7 @@
       "name": "eno2",
       "network_address": "grimoire-8-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/48",
       "vendor": "Intel"
     },
@@ -160,7 +160,7 @@
       "name": "enp129s0f0",
       "network_address": "grimoire-8-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/48",
       "vendor": "Intel"
     },
@@ -180,7 +180,7 @@
       "name": "enp129s0f1",
       "network_address": "grimoire-8-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/48",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
index 67131927d7d..954182bd428 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/1",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-1-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/1",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-1-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/1",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-1-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/1",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
index cd355c14b39..6158994e48a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-10.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/10",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-10-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/10",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-10-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/10",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-10-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/10",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
index 27a8bb9a5af..a36aa3dac84 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-11.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/11",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-11-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/11",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-11-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/11",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-11-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/11",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
index 7b20b2a2056..c7211d94088 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-12.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/12",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-12-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/12",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-12-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/12",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-12-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/12",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
index 219d9563811..c615d02f4f3 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-13.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/13",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-13-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/13",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-13-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/13",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-13-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/13",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
index 9badef8c9f1..b01658ad9e1 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-14.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/14",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-14-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/14",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-14-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/14",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-14-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/14",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
index 94817d1bd4b..e47c49f35bf 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-15.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/15",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-15-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/15",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-15-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/15",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-15-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/15",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
index a4accebb8ed..fc5779621ae 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-16.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/16",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-16-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/16",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-16-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/16",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-16-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/16",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
index 85c6aef0544..7a5d1fc4555 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-17.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/17",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-17-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/17",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-17-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/17",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-17-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/17",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
index f60e10b94c7..53aa9ad5aaf 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-18.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/18",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-18-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/18",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-18-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/18",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-18-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/18",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
index 3540e9d34fb..780af9b10ec 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-19.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/19",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-19-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/19",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-19-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/19",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-19-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/19",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
index 16fef93cbfa..8d8c0d48fab 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/2",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-2-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/2",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-2-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/2",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-2-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/2",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
index 14a2910a8f2..54599f6b7cd 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-20.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/20",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-20-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/20",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-20-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/20",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-20-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/20",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
index 6fb165671b0..9cf63ee8d88 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-21.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/21",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-21-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/21",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-21-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/21",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-21-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/21",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
index ee43be2d9cd..85b25d21776 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-22.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/22",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-22-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/22",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-22-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/22",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-22-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/22",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
index 7db193e9dae..405b1726706 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-23.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/23",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-23-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/23",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-23-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/23",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-23-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/23",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
index 07272841679..152bb72741f 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-24.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/24",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-24-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/24",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-24-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/24",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-24-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/24",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
index 61a9ff1ac61..51fef57522f 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-25.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/25",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-25-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/25",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-25-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/25",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-25-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/25",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
index 3130fea90ea..1d708a8eb40 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-26.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/26",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-26-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/26",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-26-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/26",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-26-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/26",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
index f34c5e5b1e0..5d829e61f41 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-27.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/27",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-27-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/27",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-27-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/27",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-27-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/27",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
index 05fed3f44e8..828aed2197a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-28.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/28",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-28-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/28",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-28-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/28",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-28-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/28",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
index 957afa65be0..dd9037fa171 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-29.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/29",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-29-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/29",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-29-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/29",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-29-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/29",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
index 75e4ae2fd55..eed47eacea6 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/3",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-3-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/3",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-3-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/3",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-3-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/3",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
index b4478a74774..5dcf1233105 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-30.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/30",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-30-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/30",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-30-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/30",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-30-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/30",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
index 65a0dfef7b2..b26cac1f46e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-31.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/31",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-31-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/31",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-31-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/31",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-31-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/31",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
index 1088053f332..c2eadcff286 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-32.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/32",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-32-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/32",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-32-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/32",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-32-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/32",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
index 4989e57c904..1659289575d 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-33.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/33",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-33-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/33",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-33-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/33",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-33-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/33",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
index 5a0b7260bb2..3ab9cc1eacf 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-34.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/34",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-34-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/34",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-34-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/34",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-34-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/34",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
index 5b2a0fcbd76..b076277d584 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-35.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/35",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-35-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/35",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-35-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/35",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-35-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/35",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
index f8490237478..df9cf6dee5e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-36.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/36",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-36-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/36",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-36-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/36",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-36-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/36",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
index 2a64b9efbf4..3cdb4f3c27c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-37.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/37",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-37-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/37",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-37-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/37",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-37-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/37",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
index 85e4103be66..72f9c211438 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-38.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/38",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-38-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/38",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-38-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/38",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-38-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/38",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
index 43a055f9ee9..25675769df4 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-39.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/39",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-39-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/39",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-39-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/39",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-39-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/39",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
index 0002cd9fa76..6df38cb7214 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-4.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/4",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-4-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/4",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-4-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/4",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-4-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/4",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
index e45780fedce..ee67db59590 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-40.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/40",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-40-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/40",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-40-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/40",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-40-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/40",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
index 01a7e78db73..1834bf8d08a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-41.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-41.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/27",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-41-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/1",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-41-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/2",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-41-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/3",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
index d14ee9c7d4f..fde670e0cc3 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-42.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-42.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/28",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-42-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/4",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-42-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/5",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-42-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/6",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
index 093e2eedc8e..8c9f2cede23 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-43.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-43.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/29",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-43-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/7",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-43-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/8",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-43-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/9",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
index 757e3b1e725..67df3d55ec6 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-44.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-44.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/30",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-44-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/10",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-44-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/11",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-44-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/12",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
index 6c2b54f6f29..44aea5b11f2 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-45.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-45.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/31",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-45-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/13",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-45-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/14",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-45-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/15",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
index 90e04c790e5..941a59cc071 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-46.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-46.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/32",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-46-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/16",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-46-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/17",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-46-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/18",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
index 9c8a4ef4f50..d3a02bce42a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-47.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-47.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/33",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-47-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/19",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-47-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/20",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-47-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/21",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
index cc9eb37f0b1..65c81044de0 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-48.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-48.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/34",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-48-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/22",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-48-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/23",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-48-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/24",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
index 02e790055ad..210e3443770 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-49.json
@@ -120,7 +120,7 @@
       "name": "eno1",
       "network_address": "grisou-49.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/35",
       "vendor": "Intel"
     },
@@ -140,7 +140,7 @@
       "name": "eno2",
       "network_address": "grisou-49-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/25",
       "vendor": "Intel"
     },
@@ -160,7 +160,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-49-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/26",
       "vendor": "Intel"
     },
@@ -180,7 +180,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-49-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/27",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
index b4e40ecb1e1..89d10b4dc58 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-5.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/5",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-5-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/5",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-5-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/5",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-5-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/5",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
index 77a44dbda58..d8b427252f9 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
@@ -120,7 +120,7 @@
       "name": "eno1",
       "network_address": "grisou-50.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/36",
       "vendor": "Intel"
     },
@@ -140,7 +140,7 @@
       "name": "eno2",
       "network_address": "grisou-50-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/28",
       "vendor": "Intel"
     },
@@ -160,7 +160,7 @@
       "name": "enp129s0f0",
       "network_address": "grisou-50-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/29",
       "vendor": "Intel"
     },
@@ -180,7 +180,7 @@
       "name": "enp129s0f1",
       "network_address": "grisou-50-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/30",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
index 2964cd6e816..ba50bbe89a8 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
@@ -120,7 +120,7 @@
       "name": "eno1",
       "network_address": "grisou-51.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet1/37",
       "vendor": "Intel"
     },
@@ -140,7 +140,7 @@
       "name": "eno2",
       "network_address": "grisou-51-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/31",
       "vendor": "Intel"
     },
@@ -160,7 +160,7 @@
       "name": "enp129s0f0",
       "network_address": "grisou-51-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/32",
       "vendor": "Intel"
     },
@@ -180,7 +180,7 @@
       "name": "enp129s0f1",
       "network_address": "grisou-51-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet6/33",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
index 67ba0824729..ec5763cdbfe 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-6.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/6",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-6-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/6",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-6-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/6",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-6-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/6",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
index 8073ab625b8..088880b5cc2 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-7.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/7",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-7-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/7",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-7-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/7",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-7-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/7",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
index c2964a0065c..026bd843f53 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-8.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/8",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-8-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/8",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-8-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/8",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-8-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/8",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
index 7a2382a9e14..fe837181995 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
@@ -139,7 +139,7 @@
       "name": "eno1",
       "network_address": "grisou-9.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet2/9",
       "vendor": "Intel"
     },
@@ -159,7 +159,7 @@
       "name": "eno2",
       "network_address": "grisou-9-eth1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet3/9",
       "vendor": "Intel"
     },
@@ -179,7 +179,7 @@
       "name": "enp3s0f0",
       "network_address": "grisou-9-eth2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet4/9",
       "vendor": "Intel"
     },
@@ -199,7 +199,7 @@
       "name": "enp3s0f1",
       "network_address": "grisou-9-eth3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet5/9",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
index 89fd99c4246..77bad7cbf70 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-1.json
@@ -103,7 +103,7 @@
       "name": "eno1",
       "network_address": "grue-1.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/15",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
index e11c4100d2c..6cfbe134df4 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-2.json
@@ -103,7 +103,7 @@
       "name": "eno1",
       "network_address": "grue-2.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/16",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
index 8ec568e7a55..dca447be6b5 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-3.json
@@ -103,7 +103,7 @@
       "name": "eno1",
       "network_address": "grue-3.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/17",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
index 88ba6e671ae..94dc83b8fa5 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-4.json
@@ -103,7 +103,7 @@
       "name": "eno1",
       "network_address": "grue-4.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/18",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
index cfdec1005d7..7f95dbf93fe 100644
--- a/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
+++ b/data/grid5000/sites/nancy/clusters/grue/nodes/grue-5.json
@@ -103,7 +103,7 @@
       "name": "eno1",
       "network_address": "grue-5.nancy.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nancy",
+      "switch": "gw",
       "switch_port": "Ethernet7/19",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json b/data/grid5000/sites/nancy/network_equipments/gw.json
similarity index 74%
rename from data/grid5000/sites/nancy/network_equipments/gw-nancy.json
rename to data/grid5000/sites/nancy/network_equipments/gw.json
index 5ce440d2558..62250a58cae 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw.json
@@ -1,5 +1,10 @@
 {
+  "alias": [
+    "gw-nancy",
+    "sgravillon2"
+  ],
   "backplane_bps": 1280000000000,
+  "ip": "172.16.79.254",
   "kind": "router",
   "linecards": [
     {
@@ -7,7 +12,7 @@
     {
       "backplane_bps": 1280000000000,
       "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
-      "kind": "other",
+      "kind": "node",
       "model": "N9K-X9464PX",
       "ports": [
         {
@@ -15,204 +20,245 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/1",
           "uid": "graoully-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/2",
           "uid": "graoully-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/3",
           "uid": "graoully-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/4",
           "uid": "graoully-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/5",
           "uid": "graoully-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/6",
           "uid": "graoully-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/7",
           "uid": "graoully-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/8",
           "uid": "graoully-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/9",
           "uid": "graoully-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/10",
           "uid": "graoully-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/11",
           "uid": "graoully-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/12",
           "uid": "graoully-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/13",
           "uid": "graoully-13"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/14",
           "uid": "graoully-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/15",
           "uid": "graoully-15"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/16",
           "uid": "graoully-16"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/17",
           "uid": "graphite-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/18",
           "uid": "graphite-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/19",
           "uid": "graphite-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/20",
           "uid": "graphite-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/21",
           "uid": "graphique-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/22",
           "uid": "graphique-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/23",
           "uid": "graphique-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/24",
           "uid": "graphique-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/25",
           "uid": "graphique-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/26",
           "uid": "graphique-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/27",
           "uid": "grisou-41"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/28",
           "uid": "grisou-42"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/29",
           "uid": "grisou-43"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/30",
           "uid": "grisou-44"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/31",
           "uid": "grisou-45"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/32",
           "uid": "grisou-46"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/33",
           "uid": "grisou-47"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/34",
           "uid": "grisou-48"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/35",
           "uid": "grisou-49"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/36",
           "uid": "grisou-50"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/37",
           "uid": "grisou-51"
         },
         {
         },
         {
-          "kind": "other",
+          "kind": "server",
+          "snmp_name": "Ethernet1/39",
           "uid": "srv"
         },
         {
-          "kind": "other",
+          "kind": "server",
+          "snmp_name": "Ethernet1/40",
           "uid": "srv2"
         },
         {
-          "kind": "other",
+          "kind": "server",
+          "snmp_name": "Ethernet1/41",
           "uid": "talc-data"
         },
         {
-          "kind": "other",
+          "kind": "server",
+          "snmp_name": "Ethernet1/42",
           "uid": "srv-data"
         },
         {
@@ -224,11 +270,13 @@
         {
         },
         {
-          "kind": "virtual",
+          "kind": "other",
+          "snmp_name": "Ethernet1/47",
           "uid": "LORIA"
         },
         {
-          "kind": "virtual",
+          "kind": "backbone",
+          "snmp_name": "Ethernet1/48",
           "uid": "renater-nancy"
         }
       ],
@@ -246,241 +294,289 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/1",
           "uid": "grisou-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/2",
           "uid": "grisou-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/3",
           "uid": "grisou-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/4",
           "uid": "grisou-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/5",
           "uid": "grisou-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/6",
           "uid": "grisou-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/7",
           "uid": "grisou-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/8",
           "uid": "grisou-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/9",
           "uid": "grisou-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/10",
           "uid": "grisou-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/11",
           "uid": "grisou-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/12",
           "uid": "grisou-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/13",
           "uid": "grisou-13"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/14",
           "uid": "grisou-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/15",
           "uid": "grisou-15"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/16",
           "uid": "grisou-16"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/17",
           "uid": "grisou-17"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/18",
           "uid": "grisou-18"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/19",
           "uid": "grisou-19"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/20",
           "uid": "grisou-20"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/21",
           "uid": "grisou-21"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/22",
           "uid": "grisou-22"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/23",
           "uid": "grisou-23"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/24",
           "uid": "grisou-24"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/25",
           "uid": "grisou-25"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/26",
           "uid": "grisou-26"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/27",
           "uid": "grisou-27"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/28",
           "uid": "grisou-28"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/29",
           "uid": "grisou-29"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/30",
           "uid": "grisou-30"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/31",
           "uid": "grisou-31"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/32",
           "uid": "grisou-32"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/33",
           "uid": "grisou-33"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/34",
           "uid": "grisou-34"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/35",
           "uid": "grisou-35"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/36",
           "uid": "grisou-36"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/37",
           "uid": "grisou-37"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/38",
           "uid": "grisou-38"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/39",
           "uid": "grisou-39"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/40",
           "uid": "grisou-40"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/41",
           "uid": "grimoire-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/42",
           "uid": "grimoire-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/43",
           "uid": "grimoire-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/44",
           "uid": "grimoire-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/45",
           "uid": "grimoire-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/46",
           "uid": "grimoire-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/47",
           "uid": "grimoire-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/48",
           "uid": "grimoire-8"
         }
       ],
@@ -498,241 +594,289 @@
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/1",
           "uid": "grisou-1"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/2",
           "uid": "grisou-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/3",
           "uid": "grisou-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/4",
           "uid": "grisou-4"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/5",
           "uid": "grisou-5"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/6",
           "uid": "grisou-6"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/7",
           "uid": "grisou-7"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/8",
           "uid": "grisou-8"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/9",
           "uid": "grisou-9"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/10",
           "uid": "grisou-10"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/11",
           "uid": "grisou-11"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/12",
           "uid": "grisou-12"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/13",
           "uid": "grisou-13"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/14",
           "uid": "grisou-14"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/15",
           "uid": "grisou-15"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/16",
           "uid": "grisou-16"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/17",
           "uid": "grisou-17"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/18",
           "uid": "grisou-18"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/19",
           "uid": "grisou-19"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/20",
           "uid": "grisou-20"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/21",
           "uid": "grisou-21"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/22",
           "uid": "grisou-22"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/23",
           "uid": "grisou-23"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/24",
           "uid": "grisou-24"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/25",
           "uid": "grisou-25"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/26",
           "uid": "grisou-26"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/27",
           "uid": "grisou-27"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/28",
           "uid": "grisou-28"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/29",
           "uid": "grisou-29"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/30",
           "uid": "grisou-30"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/31",
           "uid": "grisou-31"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/32",
           "uid": "grisou-32"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/33",
           "uid": "grisou-33"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/34",
           "uid": "grisou-34"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/35",
           "uid": "grisou-35"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/36",
           "uid": "grisou-36"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/37",
           "uid": "grisou-37"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/38",
           "uid": "grisou-38"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/39",
           "uid": "grisou-39"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/40",
           "uid": "grisou-40"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/41",
           "uid": "grimoire-1"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/42",
           "uid": "grimoire-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/43",
           "uid": "grimoire-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/44",
           "uid": "grimoire-4"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/45",
           "uid": "grimoire-5"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/46",
           "uid": "grimoire-6"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/47",
           "uid": "grimoire-7"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet3/48",
           "uid": "grimoire-8"
         }
       ],
@@ -750,241 +894,289 @@
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/1",
           "uid": "grisou-1"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/2",
           "uid": "grisou-2"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/3",
           "uid": "grisou-3"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/4",
           "uid": "grisou-4"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/5",
           "uid": "grisou-5"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/6",
           "uid": "grisou-6"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/7",
           "uid": "grisou-7"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/8",
           "uid": "grisou-8"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/9",
           "uid": "grisou-9"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/10",
           "uid": "grisou-10"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/11",
           "uid": "grisou-11"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/12",
           "uid": "grisou-12"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/13",
           "uid": "grisou-13"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/14",
           "uid": "grisou-14"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/15",
           "uid": "grisou-15"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/16",
           "uid": "grisou-16"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/17",
           "uid": "grisou-17"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/18",
           "uid": "grisou-18"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/19",
           "uid": "grisou-19"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/20",
           "uid": "grisou-20"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/21",
           "uid": "grisou-21"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/22",
           "uid": "grisou-22"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/23",
           "uid": "grisou-23"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/24",
           "uid": "grisou-24"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/25",
           "uid": "grisou-25"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/26",
           "uid": "grisou-26"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/27",
           "uid": "grisou-27"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/28",
           "uid": "grisou-28"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/29",
           "uid": "grisou-29"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/30",
           "uid": "grisou-30"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/31",
           "uid": "grisou-31"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/32",
           "uid": "grisou-32"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/33",
           "uid": "grisou-33"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/34",
           "uid": "grisou-34"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/35",
           "uid": "grisou-35"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/36",
           "uid": "grisou-36"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/37",
           "uid": "grisou-37"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/38",
           "uid": "grisou-38"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/39",
           "uid": "grisou-39"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/40",
           "uid": "grisou-40"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/41",
           "uid": "grimoire-1"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/42",
           "uid": "grimoire-2"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/43",
           "uid": "grimoire-3"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/44",
           "uid": "grimoire-4"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/45",
           "uid": "grimoire-5"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/46",
           "uid": "grimoire-6"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/47",
           "uid": "grimoire-7"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet4/48",
           "uid": "grimoire-8"
         }
       ],
@@ -1002,241 +1194,289 @@
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/1",
           "uid": "grisou-1"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/2",
           "uid": "grisou-2"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/3",
           "uid": "grisou-3"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/4",
           "uid": "grisou-4"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/5",
           "uid": "grisou-5"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/6",
           "uid": "grisou-6"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/7",
           "uid": "grisou-7"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/8",
           "uid": "grisou-8"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/9",
           "uid": "grisou-9"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/10",
           "uid": "grisou-10"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/11",
           "uid": "grisou-11"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/12",
           "uid": "grisou-12"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/13",
           "uid": "grisou-13"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/14",
           "uid": "grisou-14"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/15",
           "uid": "grisou-15"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/16",
           "uid": "grisou-16"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/17",
           "uid": "grisou-17"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/18",
           "uid": "grisou-18"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/19",
           "uid": "grisou-19"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/20",
           "uid": "grisou-20"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/21",
           "uid": "grisou-21"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/22",
           "uid": "grisou-22"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/23",
           "uid": "grisou-23"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/24",
           "uid": "grisou-24"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/25",
           "uid": "grisou-25"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/26",
           "uid": "grisou-26"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/27",
           "uid": "grisou-27"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/28",
           "uid": "grisou-28"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/29",
           "uid": "grisou-29"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/30",
           "uid": "grisou-30"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/31",
           "uid": "grisou-31"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/32",
           "uid": "grisou-32"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/33",
           "uid": "grisou-33"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/34",
           "uid": "grisou-34"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/35",
           "uid": "grisou-35"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/36",
           "uid": "grisou-36"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/37",
           "uid": "grisou-37"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/38",
           "uid": "grisou-38"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/39",
           "uid": "grisou-39"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/40",
           "uid": "grisou-40"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/41",
           "uid": "grimoire-1"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/42",
           "uid": "grimoire-2"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/43",
           "uid": "grimoire-3"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/44",
           "uid": "grimoire-4"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/45",
           "uid": "grimoire-5"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/46",
           "uid": "grimoire-6"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/47",
           "uid": "grimoire-7"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet5/48",
           "uid": "grimoire-8"
         }
       ],
@@ -1254,239 +1494,287 @@
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet6/1",
           "uid": "grisou-41"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/2",
           "uid": "grisou-41"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet6/3",
           "uid": "grisou-41"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet6/4",
           "uid": "grisou-42"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/5",
           "uid": "grisou-42"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet6/6",
           "uid": "grisou-42"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet6/7",
           "uid": "grisou-43"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/8",
           "uid": "grisou-43"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet6/9",
           "uid": "grisou-43"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet6/10",
           "uid": "grisou-44"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/11",
           "uid": "grisou-44"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet6/12",
           "uid": "grisou-44"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet6/13",
           "uid": "grisou-45"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/14",
           "uid": "grisou-45"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet6/15",
           "uid": "grisou-45"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet6/16",
           "uid": "grisou-46"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/17",
           "uid": "grisou-46"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet6/18",
           "uid": "grisou-46"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet6/19",
           "uid": "grisou-47"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/20",
           "uid": "grisou-47"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet6/21",
           "uid": "grisou-47"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet6/22",
           "uid": "grisou-48"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/23",
           "uid": "grisou-48"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet6/24",
           "uid": "grisou-48"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet6/25",
           "uid": "grisou-49"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/26",
           "uid": "grisou-49"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet6/27",
           "uid": "grisou-49"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet6/28",
           "uid": "grisou-50"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/29",
           "uid": "grisou-50"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet6/30",
           "uid": "grisou-50"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet6/31",
           "uid": "grisou-51"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/32",
           "uid": "grisou-51"
         },
         {
           "kind": "node",
           "port": "eth3",
+          "snmp_name": "Ethernet6/33",
           "uid": "grisou-51"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/34",
           "uid": "graffiti-8"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/35",
           "uid": "graffiti-7"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/36",
           "uid": "graffiti-2"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/37",
           "uid": "graffiti-5"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/38",
           "uid": "graffiti-6"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/39",
           "uid": "graffiti-1"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet6/40",
           "uid": "graffiti-3"
         },
         {
           "kind": "switch",
+          "snmp_name": "Ethernet6/41",
           "uid": "sgrvingt"
         },
         {
           "kind": "switch",
+          "snmp_name": "Ethernet6/42",
           "uid": "sgrisou1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet6/43",
           "uid": "grimani-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet6/44",
           "uid": "grimani-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet6/45",
           "uid": "grimani-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet6/46",
           "uid": "grimani-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet6/47",
           "uid": "grimani-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet6/48",
           "uid": "grimani-3"
         }
       ],
@@ -1504,96 +1792,115 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/1",
           "uid": "grele-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/2",
           "uid": "grele-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/3",
           "uid": "grele-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/4",
           "uid": "grele-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/5",
           "uid": "grele-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/6",
           "uid": "grele-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/7",
           "uid": "grele-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/8",
           "uid": "grele-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/9",
           "uid": "grele-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/10",
           "uid": "grele-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/11",
           "uid": "grele-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/12",
           "uid": "grele-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/13",
           "uid": "grele-13"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/14",
           "uid": "grele-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/15",
           "uid": "grue-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/16",
           "uid": "grue-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/17",
           "uid": "grue-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/18",
           "uid": "grue-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet7/19",
           "uid": "grue-5"
         },
         {
@@ -1630,6 +1937,7 @@
         },
         {
           "kind": "switch",
+          "snmp_name": "Ethernet7/36",
           "uid": "sgros2"
         },
         {
@@ -1638,6 +1946,7 @@
         },
         {
           "kind": "switch",
+          "snmp_name": "Ethernet7/39",
           "uid": "sgros1"
         },
         {
@@ -1645,6 +1954,7 @@
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet7/41",
           "uid": "graffiti-13"
         },
         {
@@ -1652,21 +1962,25 @@
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet7/43",
           "uid": "graffiti-11"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet7/44",
           "uid": "graffiti-10"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet7/45",
           "uid": "graffiti-12"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet7/46",
           "uid": "graffiti-9"
         },
         {
@@ -1674,6 +1988,7 @@
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Ethernet7/48",
           "uid": "graffiti-4"
         }
       ],
@@ -1686,11 +2001,8 @@
     "metric": "power",
     "wattmeter": "multiple"
   },
+  "role": "production",
   "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 10
-    },
     "power": {
       "available": true,
       "resolution": 1,
@@ -1719,7 +2031,7 @@
   "site": "nancy",
   "snmp_community": "public",
   "type": "network_equipment",
-  "uid": "gw-nancy",
+  "uid": "gw",
   "vlans": {
     "vlan100": {
       "addresses": [
@@ -1798,7 +2110,5 @@
       "name": "kavlan-14"
     }
   },
-  "warranty": "2020-09-01",
-  "weathermap": {
-  }
+  "warranty": "2020-09-01"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
index fa89243de33..294b50552b5 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
@@ -1,4 +1,5 @@
 {
+  "ip": "172.17.79.223",
   "kind": "switch",
   "linecards": [
     {
@@ -115,7 +116,9 @@
         },
         {
           "kind": "node",
-          "uid": "node-mapping-undocumented-for-this-ib-switch"
+          "port": "mapping-undocumented-for-this-ib-switch",
+          "snmp_name": "12/42",
+          "uid": "node"
         }
       ],
       "rate": 20000000000,
@@ -127,10 +130,8 @@
     "metric": "power",
     "wattmeter": true
   },
+  "role": "hpc",
   "sensors": {
-    "network": {
-      "available": false
-    },
     "power": {
       "available": true,
       "resolution": 1,
@@ -148,10 +149,5 @@
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "sgraoullyib",
-  "vlans": {
-  },
-  "warranty": "2020-09-01",
-  "weathermap": {
-    "use_cacti": "no"
-  }
+  "warranty": "2020-09-01"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrcinq.json b/data/grid5000/sites/nancy/network_equipments/sgrcinq.json
index 20a83caaa22..45b36000f03 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrcinq.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrcinq.json
@@ -1,298 +1,327 @@
 {
   "backplane_bps": 100000000000,
+  "ip": "172.17.79.230",
   "kind": "switch",
   "linecards": [
     {
       "kavlan_pattern": "Gi1/%LINECARD%/%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/1",
           "uid": "grcinq-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/2",
           "uid": "grcinq-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/3",
           "uid": "grcinq-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/4",
           "uid": "grcinq-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/5",
           "uid": "grcinq-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/6",
           "uid": "grcinq-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/7",
           "uid": "grcinq-15"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/8",
           "uid": "grcinq-16"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/9",
           "uid": "grcinq-19"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/10",
           "uid": "grcinq-20"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/11",
           "uid": "grcinq-23"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/12",
           "uid": "grcinq-24"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/13",
           "uid": "grcinq-27"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/14",
           "uid": "grcinq-28"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/15",
           "uid": "grcinq-31"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/16",
           "uid": "grcinq-32"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/17",
           "uid": "grcinq-35"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/18",
           "uid": "grcinq-36"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/19",
           "uid": "grcinq-39"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/20",
           "uid": "grcinq-40"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/21",
           "uid": "grcinq-43"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/22",
           "uid": "grcinq-44"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/23",
           "uid": "grcinq-47"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/24",
           "uid": "grcinq-48"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/25",
           "uid": "grcinq-45"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/26",
           "uid": "grcinq-46"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/27",
           "uid": "grcinq-41"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/28",
           "uid": "grcinq-42"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/29",
           "uid": "grcinq-37"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/30",
           "uid": "grcinq-38"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/31",
           "uid": "grcinq-33"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/32",
           "uid": "grcinq-34"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/33",
           "uid": "grcinq-29"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/34",
           "uid": "grcinq-30"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/35",
           "uid": "grcinq-25"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/36",
           "uid": "grcinq-26"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/37",
           "uid": "grcinq-21"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/38",
           "uid": "grcinq-22"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/39",
           "uid": "grcinq-17"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/40",
           "uid": "grcinq-18"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/41",
           "uid": "grcinq-13"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/42",
           "uid": "grcinq-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/43",
           "uid": "grcinq-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/44",
           "uid": "grcinq-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/45",
           "uid": "grcinq-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/46",
           "uid": "grcinq-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/47",
           "uid": "grcinq-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet1/0/48",
           "uid": "grcinq-2"
         }
       ],
       "rate": 1000000000,
-      "snmp_pattern": "GigabitEthernet 1/%LINECARD%/%PORT%"
+      "snmp_pattern": "GigabitEthernet1/%LINECARD%/%PORT%"
     },
     {
       "kavlan_pattern": "TenGigabitEthernet1/0/%PORT%",
       "kind": "other",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "switch",
-          "port": "eth0",
+          "snmp_name": "TenGigabitEthernet1/0/1",
           "uid": "sgrvingt"
         }
       ],
       "rate": 10000000000,
-      "snmp_pattern": "TenGigabitEthernet 1/0/%PORT%"
+      "snmp_pattern": "TenGigabitEthernet1/0/%PORT%"
     }
   ],
   "model": "Cisco WS-C2960X-48TD-L",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    },
-    "power": {
-      "available": false
-    }
-  },
+  "role": "production",
   "site": "nancy",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "sgrcinq",
-  "vlans": {
-    "vlan1": {
-      "addresses": [
-        "172.17.79.230"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "2028-11-28",
-  "weathermap": {
-  }
+  "warranty": "2028-11-28"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json b/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json
index c6f2ba6ca0c..447d8f73113 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrele-opf.json
@@ -1,4 +1,5 @@
 {
+  "ip": "172.17.79.253",
   "kind": "switch",
   "linecards": [
     {
@@ -35,11 +36,15 @@
         },
         {
           "kind": "node",
-          "uid": "grele-13-when-undead"
+          "port": "when-undead",
+          "snmp_name": "1/13",
+          "uid": "grele-13"
         },
         {
           "kind": "node",
-          "uid": "grele-14-when-undead"
+          "port": "when-undead",
+          "snmp_name": "1/14",
+          "uid": "grele-14"
         }
       ],
       "rate": 100000000000,
@@ -51,10 +56,8 @@
     "metric": "power",
     "wattmeter": true
   },
+  "role": "hpc",
   "sensors": {
-    "network": {
-      "available": false
-    },
     "power": {
       "available": true,
       "resolution": 1,
@@ -76,10 +79,5 @@
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "sgrele-opf",
-  "vlans": {
-  },
-  "warranty": "2022-06-01",
-  "weathermap": {
-    "use_cacti": "no"
-  }
+  "warranty": "2022-06-01"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrisou1.json b/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
index 9219ec52e92..455c29b06dd 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrisou1.json
@@ -1,253 +1,302 @@
 {
   "backplane_bps": 260000000000,
+  "ip": "172.17.79.206",
   "kind": "switch",
   "linecards": [
     {
     },
     {
       "kavlan_pattern": "GigabitEthernet%LINECARD%/%PORT%",
-      "kind": "other",
+      "kind": "node",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/1",
           "uid": "grisou-1"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/2",
           "uid": "grisou-2"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/3",
           "uid": "grisou-3"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/4",
           "uid": "grisou-4"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/5",
           "uid": "grisou-5"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/6",
           "uid": "grisou-6"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/7",
           "uid": "grisou-7"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/8",
           "uid": "grisou-8"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/9",
           "uid": "grisou-9"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/10",
           "uid": "grisou-10"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/11",
           "uid": "grisou-11"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/12",
           "uid": "grisou-12"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/13",
           "uid": "grisou-13"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/14",
           "uid": "grisou-14"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/15",
           "uid": "grisou-15"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/16",
           "uid": "grisou-16"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/17",
           "uid": "grisou-17"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/18",
           "uid": "grisou-18"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/19",
           "uid": "grisou-19"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/20",
           "uid": "grisou-20"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/21",
           "uid": "grisou-21"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/22",
           "uid": "grisou-22"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/23",
           "uid": "grisou-23"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/24",
           "uid": "grisou-24"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/25",
           "uid": "grisou-25"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/26",
           "uid": "grisou-26"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/27",
           "uid": "grisou-27"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/28",
           "uid": "grisou-28"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/29",
           "uid": "grisou-29"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/30",
           "uid": "grisou-30"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/31",
           "uid": "grisou-31"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/32",
           "uid": "grisou-32"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/33",
           "uid": "grisou-33"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/34",
           "uid": "grisou-34"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/35",
           "uid": "grisou-35"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/36",
           "uid": "grisou-36"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/37",
           "uid": "grisou-37"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/38",
           "uid": "grisou-38"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/39",
           "uid": "grisou-39"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/40",
           "uid": "grisou-40"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/41",
           "uid": "grisou-41"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/42",
           "uid": "grisou-42"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/43",
           "uid": "grisou-43"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/44",
           "uid": "grisou-44"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/45",
           "uid": "grisou-45"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/46",
           "uid": "grisou-46"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/47",
           "uid": "grisou-47"
         },
         {
           "kind": "node",
           "port": "eth4",
+          "snmp_name": "GigabitEthernet 1/48",
           "uid": "grisou-48"
         }
       ],
@@ -364,7 +413,8 @@
         },
         {
           "kind": "router",
-          "uid": "gw-nancy"
+          "snmp_name": "TenGigabitEthernet 1/52",
+          "uid": "gw"
         }
       ],
       "rate": 10000000000,
@@ -376,6 +426,7 @@
     "metric": "power",
     "wattmeter": true
   },
+  "role": "production",
   "sensors": {
     "power": {
       "available": true,
@@ -394,15 +445,5 @@
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "sgrisou1",
-  "vlans": {
-    "vlan1": {
-      "addresses": [
-        "172.17.79.206"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "2022-06-01",
-  "weathermap": {
-  }
+  "warranty": "2022-06-01"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros1.json b/data/grid5000/sites/nancy/network_equipments/sgros1.json
index 222970e01f3..6406af410de 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgros1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgros1.json
@@ -1,5 +1,6 @@
 {
   "backplane_bps": 6400000000000,
+  "ip": "172.17.79.208",
   "kind": "switch",
   "linecards": [
     {
@@ -11,28 +12,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/3:1",
           "uid": "gros-117"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/3:2",
           "uid": "gros-118"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/3:3",
           "uid": "gros-119"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/3:4",
           "uid": "gros-120"
         }
       ],
@@ -44,28 +48,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/5:1",
           "uid": "gros-113"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/5:2",
           "uid": "gros-114"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/5:3",
           "uid": "gros-115"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/5:4",
           "uid": "gros-116"
         }
       ],
@@ -77,28 +84,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/7:1",
           "uid": "gros-109"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/7:2",
           "uid": "gros-110"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/7:3",
           "uid": "gros-111"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/7:4",
           "uid": "gros-112"
         }
       ],
@@ -110,28 +120,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/9:1",
           "uid": "gros-105"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/9:2",
           "uid": "gros-106"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/9:3",
           "uid": "gros-107"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/9:4",
           "uid": "gros-108"
         }
       ],
@@ -143,28 +156,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/11:1",
           "uid": "gros-101"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/11:2",
           "uid": "gros-102"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/11:3",
           "uid": "gros-103"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/11:4",
           "uid": "gros-104"
         }
       ],
@@ -176,28 +192,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/13:1",
           "uid": "gros-97"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/13:2",
           "uid": "gros-98"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/13:3",
           "uid": "gros-99"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/13:4",
           "uid": "gros-100"
         }
       ],
@@ -209,28 +228,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/15:1",
           "uid": "gros-61"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/15:2",
           "uid": "gros-62"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/15:3",
           "uid": "gros-63"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/15:4",
           "uid": "gros-64"
         }
       ],
@@ -242,28 +264,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/17:1",
           "uid": "gros-65"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/17:2",
           "uid": "gros-66"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/17:3",
           "uid": "gros-67"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/17:4",
           "uid": "gros-68"
         }
       ],
@@ -275,28 +300,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/19:1",
           "uid": "gros-69"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/19:2",
           "uid": "gros-70"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/19:3",
           "uid": "gros-71"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/19:4",
           "uid": "gros-72"
         }
       ],
@@ -308,28 +336,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/21:1",
           "uid": "gros-73"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/21:2",
           "uid": "gros-74"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/21:3",
           "uid": "gros-75"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/21:4",
           "uid": "gros-76"
         }
       ],
@@ -341,28 +372,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/23:1",
           "uid": "gros-25"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/23:2",
           "uid": "gros-26"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/23:3",
           "uid": "gros-27"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/23:4",
           "uid": "gros-28"
         }
       ],
@@ -374,28 +408,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/25:1",
           "uid": "gros-29"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/25:2",
           "uid": "gros-30"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/25:3",
           "uid": "gros-31"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/25:4",
           "uid": "gros-32"
         }
       ],
@@ -407,28 +444,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/27:1",
           "uid": "gros-33"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/27:2",
           "uid": "gros-34"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/27:3",
           "uid": "gros-35"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/27:4",
           "uid": "gros-36"
         }
       ],
@@ -440,28 +480,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/29:1",
           "uid": "gros-37"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/29:2",
           "uid": "gros-38"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/29:3",
           "uid": "gros-39"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/29:4",
           "uid": "gros-40"
         }
       ],
@@ -473,28 +516,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/31:1",
           "uid": "gros-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/31:2",
           "uid": "gros-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/31:3",
           "uid": "gros-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/31:4",
           "uid": "gros-8"
         }
       ],
@@ -506,28 +552,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/33:1",
           "uid": "gros-121"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/33:2",
           "uid": "gros-122"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/33:3",
           "uid": "gros-123"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/33:4",
           "uid": "gros-124"
         }
       ],
@@ -539,28 +588,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/35:1",
           "uid": "gros-77"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/35:2",
           "uid": "gros-78"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/35:3",
           "uid": "gros-79"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/35:4",
           "uid": "gros-80"
         }
       ],
@@ -572,28 +624,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/37:1",
           "uid": "gros-81"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/37:2",
           "uid": "gros-82"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/37:3",
           "uid": "gros-83"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/37:4",
           "uid": "gros-84"
         }
       ],
@@ -605,28 +660,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/39:1",
           "uid": "gros-85"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/39:2",
           "uid": "gros-86"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/39:3",
           "uid": "gros-87"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/39:4",
           "uid": "gros-88"
         }
       ],
@@ -638,28 +696,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/41:1",
           "uid": "gros-89"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/41:2",
           "uid": "gros-90"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/41:3",
           "uid": "gros-91"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/41:4",
           "uid": "gros-92"
         }
       ],
@@ -671,28 +732,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/43:1",
           "uid": "gros-93"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/43:2",
           "uid": "gros-94"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/43:3",
           "uid": "gros-95"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/43:4",
           "uid": "gros-96"
         }
       ],
@@ -704,28 +768,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/45:1",
           "uid": "gros-57"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/45:2",
           "uid": "gros-58"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/45:3",
           "uid": "gros-59"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/45:4",
           "uid": "gros-60"
         }
       ],
@@ -737,28 +804,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/47:1",
           "uid": "gros-53"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/47:2",
           "uid": "gros-54"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/47:3",
           "uid": "gros-55"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/47:4",
           "uid": "gros-56"
         }
       ],
@@ -770,28 +840,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/49:1",
           "uid": "gros-49"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/49:2",
           "uid": "gros-50"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/49:3",
           "uid": "gros-51"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/49:4",
           "uid": "gros-52"
         }
       ],
@@ -803,28 +876,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/51:1",
           "uid": "gros-45"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/51:2",
           "uid": "gros-46"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/51:3",
           "uid": "gros-47"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/51:4",
           "uid": "gros-48"
         }
       ],
@@ -836,28 +912,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/53:1",
           "uid": "gros-41"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/53:2",
           "uid": "gros-42"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/53:3",
           "uid": "gros-43"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/53:4",
           "uid": "gros-44"
         }
       ],
@@ -869,28 +948,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/55:1",
           "uid": "gros-21"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/55:2",
           "uid": "gros-22"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/55:3",
           "uid": "gros-23"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/55:4",
           "uid": "gros-24"
         }
       ],
@@ -902,28 +984,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/57:1",
           "uid": "gros-17"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/57:2",
           "uid": "gros-18"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/57:3",
           "uid": "gros-19"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/57:4",
           "uid": "gros-20"
         }
       ],
@@ -935,28 +1020,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/59:1",
           "uid": "gros-13"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/59:2",
           "uid": "gros-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/59:3",
           "uid": "gros-15"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/59:4",
           "uid": "gros-16"
         }
       ],
@@ -968,28 +1056,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/61:1",
           "uid": "gros-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/61:2",
           "uid": "gros-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/61:3",
           "uid": "gros-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/61:4",
           "uid": "gros-12"
         }
       ],
@@ -1001,28 +1092,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/63:1",
           "uid": "gros-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/63:2",
           "uid": "gros-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/63:3",
           "uid": "gros-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "ethernet 1/1/63:4",
           "uid": "gros-4"
         }
       ],
@@ -1038,7 +1132,8 @@
         },
         {
           "kind": "router",
-          "uid": "gw-nancy"
+          "snmp_name": "ethernet 1/1/65",
+          "uid": "gw"
         }
       ],
       "rate": 10000000000,
@@ -1046,28 +1141,10 @@
     }
   ],
   "model": "Dell Z9264F-ON",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    },
-    "power": {
-      "available": false
-    }
-  },
+  "role": "production",
   "site": "nancy",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "sgros1",
-  "vlans": {
-    "vlan1": {
-      "addresses": [
-        "172.17.79.208"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "2026-07-11",
-  "weathermap": {
-  }
+  "warranty": "2026-07-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgros2.json b/data/grid5000/sites/nancy/network_equipments/sgros2.json
index 4533b1a5f51..4c5a9cc5aed 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgros2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgros2.json
@@ -1,5 +1,6 @@
 {
   "backplane_bps": 6400000000000,
+  "ip": "172.17.79.209",
   "kind": "switch",
   "linecards": [
     {
@@ -11,28 +12,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/3:1",
           "uid": "gros-117"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/3:2",
           "uid": "gros-118"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/3:3",
           "uid": "gros-119"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/3:4",
           "uid": "gros-120"
         }
       ],
@@ -44,28 +48,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/5:1",
           "uid": "gros-113"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/5:2",
           "uid": "gros-114"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/5:3",
           "uid": "gros-115"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/5:4",
           "uid": "gros-116"
         }
       ],
@@ -77,28 +84,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/7:1",
           "uid": "gros-109"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/7:2",
           "uid": "gros-110"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/7:3",
           "uid": "gros-111"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/7:4",
           "uid": "gros-112"
         }
       ],
@@ -110,28 +120,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/9:1",
           "uid": "gros-105"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/9:2",
           "uid": "gros-106"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/9:3",
           "uid": "gros-107"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/9:4",
           "uid": "gros-108"
         }
       ],
@@ -143,28 +156,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/11:1",
           "uid": "gros-101"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/11:2",
           "uid": "gros-102"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/11:3",
           "uid": "gros-103"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/11:4",
           "uid": "gros-104"
         }
       ],
@@ -176,28 +192,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/13:1",
           "uid": "gros-97"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/13:2",
           "uid": "gros-98"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/13:3",
           "uid": "gros-99"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/13:4",
           "uid": "gros-100"
         }
       ],
@@ -209,28 +228,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/15:1",
           "uid": "gros-61"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/15:2",
           "uid": "gros-62"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/15:3",
           "uid": "gros-63"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/15:4",
           "uid": "gros-64"
         }
       ],
@@ -242,28 +264,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/17:1",
           "uid": "gros-65"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/17:2",
           "uid": "gros-66"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/17:3",
           "uid": "gros-67"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/17:4",
           "uid": "gros-68"
         }
       ],
@@ -275,28 +300,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/19:1",
           "uid": "gros-69"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/19:2",
           "uid": "gros-70"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/19:3",
           "uid": "gros-71"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/19:4",
           "uid": "gros-72"
         }
       ],
@@ -308,28 +336,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/21:1",
           "uid": "gros-73"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/21:2",
           "uid": "gros-74"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/21:3",
           "uid": "gros-75"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/21:4",
           "uid": "gros-76"
         }
       ],
@@ -341,28 +372,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/23:1",
           "uid": "gros-25"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/23:2",
           "uid": "gros-26"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/23:3",
           "uid": "gros-27"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/23:4",
           "uid": "gros-28"
         }
       ],
@@ -374,28 +408,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/25:1",
           "uid": "gros-29"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/25:2",
           "uid": "gros-30"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/25:3",
           "uid": "gros-31"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/25:4",
           "uid": "gros-32"
         }
       ],
@@ -407,28 +444,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/27:1",
           "uid": "gros-33"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/27:2",
           "uid": "gros-34"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/27:3",
           "uid": "gros-35"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/27:4",
           "uid": "gros-36"
         }
       ],
@@ -440,28 +480,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/29:1",
           "uid": "gros-37"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/29:2",
           "uid": "gros-38"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/29:3",
           "uid": "gros-39"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/29:4",
           "uid": "gros-40"
         }
       ],
@@ -473,28 +516,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/31:1",
           "uid": "gros-5"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/31:2",
           "uid": "gros-6"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/31:3",
           "uid": "gros-7"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/31:4",
           "uid": "gros-8"
         }
       ],
@@ -506,28 +552,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/33:1",
           "uid": "gros-121"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/33:2",
           "uid": "gros-122"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/33:3",
           "uid": "gros-123"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/33:4",
           "uid": "gros-124"
         }
       ],
@@ -539,28 +588,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/35:1",
           "uid": "gros-77"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/35:2",
           "uid": "gros-78"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/35:3",
           "uid": "gros-79"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/35:4",
           "uid": "gros-80"
         }
       ],
@@ -572,28 +624,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/37:1",
           "uid": "gros-81"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/37:2",
           "uid": "gros-82"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/37:3",
           "uid": "gros-83"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/37:4",
           "uid": "gros-84"
         }
       ],
@@ -605,28 +660,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/39:1",
           "uid": "gros-85"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/39:2",
           "uid": "gros-86"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/39:3",
           "uid": "gros-87"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/39:4",
           "uid": "gros-88"
         }
       ],
@@ -638,28 +696,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/41:1",
           "uid": "gros-89"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/41:2",
           "uid": "gros-90"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/41:3",
           "uid": "gros-91"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/41:4",
           "uid": "gros-92"
         }
       ],
@@ -671,28 +732,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/43:1",
           "uid": "gros-93"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/43:2",
           "uid": "gros-94"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/43:3",
           "uid": "gros-95"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/43:4",
           "uid": "gros-96"
         }
       ],
@@ -704,28 +768,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/45:1",
           "uid": "gros-57"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/45:2",
           "uid": "gros-58"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/45:3",
           "uid": "gros-59"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/45:4",
           "uid": "gros-60"
         }
       ],
@@ -737,28 +804,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/47:1",
           "uid": "gros-53"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/47:2",
           "uid": "gros-54"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/47:3",
           "uid": "gros-55"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/47:4",
           "uid": "gros-56"
         }
       ],
@@ -770,28 +840,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/49:1",
           "uid": "gros-49"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/49:2",
           "uid": "gros-50"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/49:3",
           "uid": "gros-51"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/49:4",
           "uid": "gros-52"
         }
       ],
@@ -803,28 +876,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/51:1",
           "uid": "gros-45"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/51:2",
           "uid": "gros-46"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/51:3",
           "uid": "gros-47"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/51:4",
           "uid": "gros-48"
         }
       ],
@@ -836,28 +912,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/53:1",
           "uid": "gros-41"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/53:2",
           "uid": "gros-42"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/53:3",
           "uid": "gros-43"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/53:4",
           "uid": "gros-44"
         }
       ],
@@ -869,28 +948,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/55:1",
           "uid": "gros-21"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/55:2",
           "uid": "gros-22"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/55:3",
           "uid": "gros-23"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/55:4",
           "uid": "gros-24"
         }
       ],
@@ -902,28 +984,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/57:1",
           "uid": "gros-17"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/57:2",
           "uid": "gros-18"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/57:3",
           "uid": "gros-19"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/57:4",
           "uid": "gros-20"
         }
       ],
@@ -935,28 +1020,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/59:1",
           "uid": "gros-13"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/59:2",
           "uid": "gros-14"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/59:3",
           "uid": "gros-15"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/59:4",
           "uid": "gros-16"
         }
       ],
@@ -968,28 +1056,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/61:1",
           "uid": "gros-9"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/61:2",
           "uid": "gros-10"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/61:3",
           "uid": "gros-11"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/61:4",
           "uid": "gros-12"
         }
       ],
@@ -1001,28 +1092,31 @@
     {
       "kavlan_pattern": "ethernet1/1/%LINECARD%:%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/63:1",
           "uid": "gros-1"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/63:2",
           "uid": "gros-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/63:3",
           "uid": "gros-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "ethernet 1/1/63:4",
           "uid": "gros-4"
         }
       ],
@@ -1040,7 +1134,8 @@
         },
         {
           "kind": "router",
-          "uid": "gw-nancy"
+          "snmp_name": "ethernet 1/1/66",
+          "uid": "gw"
         }
       ],
       "rate": 10000000000,
@@ -1048,28 +1143,10 @@
     }
   ],
   "model": "Dell Z9264F-ON",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    },
-    "power": {
-      "available": false
-    }
-  },
+  "role": "production",
   "site": "nancy",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "sgros2",
-  "vlans": {
-    "vlan1": {
-      "addresses": [
-        "172.17.79.209"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "2026-07-11",
-  "weathermap": {
-  }
+  "warranty": "2026-07-11"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
index 5b4b14eef78..74028d25e17 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrvingt.json
@@ -1,5 +1,6 @@
 {
   "backplane_bps": 1440000000000,
+  "ip": "172.17.79.207",
   "kind": "switch",
   "linecards": [
     {
@@ -7,246 +8,285 @@
     {
       "kavlan_pattern": "TenGigabitEthernet%LINECARD%/%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/1",
           "uid": "grvingt-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/2",
           "uid": "grvingt-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/3",
           "uid": "grvingt-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/4",
           "uid": "grvingt-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/5",
           "uid": "grvingt-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/6",
           "uid": "grvingt-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/7",
           "uid": "grvingt-15"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/8",
           "uid": "grvingt-16"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/9",
           "uid": "grvingt-19"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/10",
           "uid": "grvingt-20"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/11",
           "uid": "grvingt-23"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/12",
           "uid": "grvingt-24"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/13",
           "uid": "grvingt-27"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/14",
           "uid": "grvingt-28"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/15",
           "uid": "grvingt-31"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/16",
           "uid": "grvingt-32"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/17",
           "uid": "grvingt-35"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/18",
           "uid": "grvingt-36"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/19",
           "uid": "grvingt-39"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/20",
           "uid": "grvingt-40"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/21",
           "uid": "grvingt-38"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/22",
           "uid": "grvingt-37"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/23",
           "uid": "grvingt-33"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/24",
           "uid": "grvingt-34"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/25",
           "uid": "grvingt-29"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/26",
           "uid": "grvingt-30"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/27",
           "uid": "grvingt-25"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/28",
           "uid": "grvingt-26"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/29",
           "uid": "grvingt-21"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/30",
           "uid": "grvingt-22"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/31",
           "uid": "grvingt-17"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/32",
           "uid": "grvingt-18"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/33",
           "uid": "grvingt-13"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/34",
           "uid": "grvingt-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/35",
           "uid": "grvingt-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/36",
           "uid": "grvingt-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/37",
           "uid": "grvingt-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/38",
           "uid": "grvingt-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/39",
           "uid": "grvingt-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/40",
           "uid": "grvingt-2"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "TenGigabitEthernet 1/41",
           "uid": "grcinq-srv-3"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "TenGigabitEthernet 1/42",
           "uid": "grcinq-srv-2"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "TenGigabitEthernet 1/43",
           "uid": "grvingt-srv"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "TenGigabitEthernet 1/44",
           "uid": "wurst"
         },
         {
           "kind": "switch",
-          "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/45",
           "uid": "sgrcinq"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "TenGigabitEthernet 1/46",
           "uid": "grcinq-srv-1"
         },
         {
         },
         {
           "kind": "router",
-          "port": "eth0",
-          "uid": "gw-nancy"
+          "snmp_name": "TenGigabitEthernet 1/48",
+          "uid": "gw"
         }
       ],
       "rate": 10000000000,
@@ -349,28 +389,31 @@
     {
       "kavlan_pattern": "TenGigabitEthernet1/%LINECARD%/%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/49/1",
           "uid": "grvingt-44"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/49/2",
           "uid": "grvingt-43"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/49/3",
           "uid": "grvingt-48"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/49/4",
           "uid": "grvingt-47"
         }
       ],
@@ -380,28 +423,31 @@
     {
       "kavlan_pattern": "TenGigabitEthernet1/%LINECARD%/%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/50/1",
           "uid": "grvingt-58"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/50/2",
           "uid": "grvingt-57"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/50/3",
           "uid": "grvingt-62"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/50/4",
           "uid": "grvingt-61"
         }
       ],
@@ -411,28 +457,31 @@
     {
       "kavlan_pattern": "TenGigabitEthernet1/%LINECARD%/%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/51/1",
           "uid": "grvingt-52"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/51/2",
           "uid": "grvingt-51"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/51/3",
           "uid": "grvingt-56"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/51/4",
           "uid": "grvingt-55"
         }
       ],
@@ -442,28 +491,31 @@
     {
       "kavlan_pattern": "TenGigabitEthernet1/%LINECARD%/%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/52/1",
           "uid": "grvingt-50"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/52/2",
           "uid": "grvingt-49"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/52/3",
           "uid": "grvingt-54"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/52/4",
           "uid": "grvingt-53"
         }
       ],
@@ -473,28 +525,31 @@
     {
       "kavlan_pattern": "TenGigabitEthernet1/%LINECARD%/%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/53/1",
           "uid": "grvingt-60"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/53/2",
           "uid": "grvingt-59"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/53/3",
           "uid": "grvingt-64"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/53/4",
           "uid": "grvingt-63"
         }
       ],
@@ -504,28 +559,31 @@
     {
       "kavlan_pattern": "TenGigabitEthernet1/%LINECARD%/%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/54/1",
           "uid": "grvingt-42"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/54/2",
           "uid": "grvingt-41"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/54/3",
           "uid": "grvingt-46"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/54/4",
           "uid": "grvingt-45"
         }
       ],
@@ -534,28 +592,10 @@
     }
   ],
   "model": "Dell S4048",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    },
-    "power": {
-      "available": false
-    }
-  },
+  "role": "production",
   "site": "nancy",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "sgrvingt",
-  "vlans": {
-    "vlan1": {
-      "addresses": [
-        "172.17.79.207"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "2023-03-27",
-  "weathermap": {
-  }
+  "warranty": "2023-03-27"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
index f5232759cc4..3c13a8e6afd 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-1.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-1.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/45",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
index 3d0b78590da..27a82248688 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-10.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-10.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/10",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
index 0c00c595e0b..4303e882c78 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-11.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-11.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/19",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
index b0cd165c1b0..c7d31ac784e 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-12.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-12.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/18",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
index 6b2fbc78dfc..9746b59d553 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-13.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-13.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/39",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
index 55f257dd3fe..42089a15791 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-14.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-14.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/38",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
index d45872437fd..5bdf190312d 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-15.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-15.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/21",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
index 116002a7f8f..072fd93e55c 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-16.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-16.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/20",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
index d058ca0abfe..dfcf932d73f 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-17.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-17.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/13",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
index c72de68c30f..0708a5af9fe 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-18.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-18.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/22",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
index d14baa3f1c5..a87c82027de 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-19.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-19.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/29",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
index aeaed5e7f98..d2b9f26ba38 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-2.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-2.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/44",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
index 09382d0e7da..a389357488c 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-20.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-20.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/28",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
index 0ef4f3145a0..9b0127878e9 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-21.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-21.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/31",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
index 913250a9a9e..bca739988e8 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-22.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-22.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/32",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
index 0f884d288cb..c6bd2771c01 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-3.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-3.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/15",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
index 3ba29c3541b..8d1cf0a5dbf 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-4.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-4.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/14",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
index 686518f74bd..6d321430d82 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-5.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-5.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/43",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
index 94f1d349f83..50f2c483d05 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-6.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-6.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/42",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
index a628a775fd0..e8146341e74 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-7.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-7.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/17",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
index 578a9cb9fa1..de54f7b00f1 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-8.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-8.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/16",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
index 4c602210d5d..5c6740c818a 100644
--- a/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
+++ b/data/grid5000/sites/nantes/clusters/econome/nodes/econome-9.json
@@ -63,7 +63,7 @@
       "name": "enp3s0f0",
       "network_address": "econome-9.nantes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-nantes",
+      "switch": "gw",
       "switch_port": "TenGigabitEthernet 0/41",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json b/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json
index c7293e78345..3b17abfae7d 100644
--- a/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json
+++ b/data/grid5000/sites/nantes/network_equipments/ecotype-prod1.json
@@ -1,5 +1,14 @@
 {
   "backplane_bps": 1280000000000,
+  "channels": {
+    "Port-channel 1": {
+      "kind": "router",
+      "port": "Port-channel 1",
+      "rate": 80000000000,
+      "uid": "gw"
+    }
+  },
+  "ip": "172.16.207.252",
   "kind": "switch",
   "linecards": [
     {
@@ -7,261 +16,308 @@
     {
       "kavlan_pattern": "%LINECARD%/%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/1",
           "uid": "ecotype-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/2",
           "uid": "ecotype-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/3",
           "uid": "ecotype-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/4",
           "uid": "ecotype-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/5",
           "uid": "ecotype-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/6",
           "uid": "ecotype-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/7",
           "uid": "ecotype-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/8",
           "uid": "ecotype-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/9",
           "uid": "ecotype-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/10",
           "uid": "ecotype-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/11",
           "uid": "ecotype-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/12",
           "uid": "ecotype-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/13",
           "uid": "ecotype-13"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/14",
           "uid": "ecotype-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/15",
           "uid": "ecotype-15"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/16",
           "uid": "ecotype-16"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/17",
           "uid": "ecotype-17"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/18",
           "uid": "ecotype-18"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/19",
           "uid": "ecotype-19"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/20",
           "uid": "ecotype-20"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/21",
           "uid": "ecotype-21"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/22",
           "uid": "ecotype-22"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/23",
           "uid": "ecotype-23"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/24",
           "uid": "ecotype-24"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/25",
           "uid": "ecotype-25"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/26",
           "uid": "ecotype-26"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/27",
           "uid": "ecotype-27"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/28",
           "uid": "ecotype-28"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/29",
           "uid": "ecotype-29"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/30",
           "uid": "ecotype-30"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/31",
           "uid": "ecotype-31"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/32",
           "uid": "ecotype-32"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/33",
           "uid": "ecotype-33"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/34",
           "uid": "ecotype-34"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/35",
           "uid": "ecotype-35"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/36",
           "uid": "ecotype-36"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/37",
           "uid": "ecotype-37"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/38",
           "uid": "ecotype-38"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/39",
           "uid": "ecotype-39"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/40",
           "uid": "ecotype-40"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/41",
           "uid": "ecotype-41"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/42",
           "uid": "ecotype-42"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/43",
           "uid": "ecotype-43"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/44",
           "uid": "ecotype-44"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/45",
           "uid": "ecotype-45"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/46",
           "uid": "ecotype-46"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/47",
           "uid": "ecotype-47"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 1/48",
           "uid": "ecotype-48"
         },
         {
-          "aggregation": "lacp",
-          "kind": "router",
-          "port": "fortyGigE0/52",
-          "uid": "gw-nantes"
+          "kind": "channel",
+          "rate": 40000000000,
+          "snmp_name": "fortyGigE 1/49",
+          "uid": "Port-channel 1"
         },
         {
-          "aggregation": "lacp",
-          "kind": "router",
-          "port": "fortyGigE0/48",
-          "uid": "gw-nantes"
+          "kind": "channel",
+          "rate": 40000000000,
+          "snmp_name": "fortyGigE 1/50",
+          "uid": "Port-channel 1"
         }
       ],
       "rate": 10000000000,
@@ -269,17 +325,10 @@
     }
   ],
   "model": "S4048-ON",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "nantes",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "ecotype-prod1",
-  "warranty": "2022-06-01",
-  "weathermap": {
-  }
+  "warranty": "2022-06-01"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json b/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json
index ee5b967c7cf..d117af3333d 100644
--- a/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json
+++ b/data/grid5000/sites/nantes/network_equipments/ecotype-prod2.json
@@ -1,5 +1,14 @@
 {
   "backplane_bps": 1280000000000,
+  "channels": {
+    "Port-channel 1": {
+      "kind": "router",
+      "port": "Port-channel 2",
+      "rate": 80000000000,
+      "uid": "gw"
+    }
+  },
+  "ip": "172.16.207.251",
   "kind": "switch",
   "linecards": [
     {
@@ -7,261 +16,310 @@
     {
       "kavlan_pattern": "%LINECARD%/%PORT%",
       "kind": "node",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/1",
           "uid": "ecotype-1"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/2",
           "uid": "ecotype-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/3",
           "uid": "ecotype-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/4",
           "uid": "ecotype-4"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/5",
           "uid": "ecotype-5"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/6",
           "uid": "ecotype-6"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/7",
           "uid": "ecotype-7"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/8",
           "uid": "ecotype-8"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/9",
           "uid": "ecotype-9"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/10",
           "uid": "ecotype-10"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/11",
           "uid": "ecotype-11"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/12",
           "uid": "ecotype-12"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/13",
           "uid": "ecotype-13"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/14",
           "uid": "ecotype-14"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/15",
           "uid": "ecotype-15"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/16",
           "uid": "ecotype-16"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/17",
           "uid": "ecotype-17"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/18",
           "uid": "ecotype-18"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/19",
           "uid": "ecotype-19"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/20",
           "uid": "ecotype-20"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/21",
           "uid": "ecotype-21"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/22",
           "uid": "ecotype-22"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/23",
           "uid": "ecotype-23"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/24",
           "uid": "ecotype-24"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/25",
           "uid": "ecotype-25"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/26",
           "uid": "ecotype-26"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/27",
           "uid": "ecotype-27"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/28",
           "uid": "ecotype-28"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/29",
           "uid": "ecotype-29"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/30",
           "uid": "ecotype-30"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/31",
           "uid": "ecotype-31"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/32",
           "uid": "ecotype-32"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/33",
           "uid": "ecotype-33"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/34",
           "uid": "ecotype-34"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/35",
           "uid": "ecotype-35"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/36",
           "uid": "ecotype-36"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/37",
           "uid": "ecotype-37"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/38",
           "uid": "ecotype-38"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/39",
           "uid": "ecotype-39"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/40",
           "uid": "ecotype-40"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/41",
           "uid": "ecotype-41"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/42",
           "uid": "ecotype-42"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/43",
           "uid": "ecotype-43"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/44",
           "uid": "ecotype-44"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/45",
           "uid": "ecotype-45"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/46",
           "uid": "ecotype-46"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/47",
           "uid": "ecotype-47"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "TenGigabitEthernet 1/48",
           "uid": "ecotype-48"
         },
         {
-          "aggregation": "lacp",
-          "kind": "router",
-          "port": "fortyGigE0/60",
-          "uid": "gw-nantes"
+          "kind": "channel",
+          "port": "fortyGigE 0/60",
+          "rate": 40000000000,
+          "snmp_name": "fortyGigE 1/49",
+          "uid": "Port-channel 1"
         },
         {
-          "aggregation": "lacp",
-          "kind": "router",
-          "port": "fortyGigE0/56",
-          "uid": "gw-nantes"
+          "kind": "channel",
+          "port": "fortyGigE 0/56",
+          "rate": 40000000000,
+          "snmp_name": "fortyGigE 1/50",
+          "uid": "Port-channel 1"
         }
       ],
       "rate": 10000000000,
@@ -269,17 +327,10 @@
     }
   ],
   "model": "S4048-ON",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "nantes",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "ecotype-prod2",
-  "warranty": "2022-06-01",
-  "weathermap": {
-  }
+  "warranty": "2022-06-01"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nantes/network_equipments/gw-nantes.json b/data/grid5000/sites/nantes/network_equipments/gw.json
similarity index 69%
rename from data/grid5000/sites/nantes/network_equipments/gw-nantes.json
rename to data/grid5000/sites/nantes/network_equipments/gw.json
index dc7c1caefe0..9d5cb5420d7 100644
--- a/data/grid5000/sites/nantes/network_equipments/gw-nantes.json
+++ b/data/grid5000/sites/nantes/network_equipments/gw.json
@@ -1,15 +1,32 @@
 {
+  "alias": [
+    "gw-nantes"
+  ],
   "backplane_bps": 1280000000000,
+  "channels": {
+    "Port-channel 1": {
+      "kind": "switch",
+      "port": "Port-channel 1",
+      "rate": 80000000000,
+      "uid": "ecotype-prod1"
+    },
+    "Port-channel 2": {
+      "kind": "switch",
+      "port": "Port-channel 1",
+      "rate": 80000000000,
+      "uid": "ecotype-prod2"
+    }
+  },
+  "ip": "172.16.207.254",
   "kind": "router",
   "linecards": [
     {
       "kavlan_pattern": "%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
-          "kind": "virtual",
-          "port": "eth0",
+          "kind": "backbone",
+          "snmp_name": "TenGigabitEthernet 0/0",
           "uid": "renater-nantes"
         },
         {
@@ -33,6 +50,7 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/10",
           "uid": "econome-10"
         },
         {
@@ -42,51 +60,61 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/13",
           "uid": "econome-17"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/14",
           "uid": "econome-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/15",
           "uid": "econome-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/16",
           "uid": "econome-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/17",
           "uid": "econome-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/18",
           "uid": "econome-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/19",
           "uid": "econome-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/20",
           "uid": "econome-16"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/21",
           "uid": "econome-15"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/22",
           "uid": "econome-18"
         },
         {
@@ -102,11 +130,13 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/28",
           "uid": "econome-20"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/29",
           "uid": "econome-19"
         },
         {
@@ -114,11 +144,13 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/31",
           "uid": "econome-21"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/32",
           "uid": "econome-22"
         },
         {
@@ -134,11 +166,13 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/38",
           "uid": "econome-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/39",
           "uid": "econome-13"
         },
         {
@@ -146,26 +180,31 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/41",
           "uid": "econome-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/42",
           "uid": "econome-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/43",
           "uid": "econome-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/44",
           "uid": "econome-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "TenGigabitEthernet 0/45",
           "uid": "econome-1"
         },
         {
@@ -173,10 +212,10 @@
         {
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "fortyGigE0/50",
-          "uid": "ecotype-prod1"
+          "kind": "channel",
+          "rate": 40000000000,
+          "snmp_name": "fortyGigE 0/48",
+          "uid": "Port-channel 1"
         },
         {
         },
@@ -185,10 +224,10 @@
         {
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "fortyGigE0/49",
-          "uid": "ecotype-prod1"
+          "kind": "channel",
+          "rate": 40000000000,
+          "snmp_name": "fortyGigE 0/52",
+          "uid": "Port-channel 1"
         },
         {
         },
@@ -197,10 +236,10 @@
         {
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "fortyGigE0/50",
-          "uid": "ecotype-prod2"
+          "kind": "channel",
+          "rate": 40000000000,
+          "snmp_name": "fortyGigE 0/56",
+          "uid": "Port-channel 2"
         },
         {
         },
@@ -209,10 +248,10 @@
         {
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "fortyGigE0/49",
-          "uid": "ecotype-prod2"
+          "kind": "channel",
+          "rate": 40000000000,
+          "snmp_name": "fortyGigE 0/60",
+          "uid": "Port-channel 2"
         }
       ],
       "rate": 10000000000,
@@ -220,16 +259,11 @@
     }
   ],
   "model": "Force10 S4810",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "nantes",
   "snmp_community": "public",
   "type": "network_equipment",
-  "uid": "gw-nantes",
+  "uid": "gw",
   "vlans": {
     "vlan100": {
       "addresses": [
@@ -308,7 +342,5 @@
       "name": "kavlan-21"
     }
   },
-  "warranty": "2017-10-01",
-  "weathermap": {
-  }
+  "warranty": "2017-10-01"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
index 92427b95062..30a3f5b8ab4 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-1.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/2",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-1-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/1",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
index 4aa5c370735..76a9fa521bc 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-10.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-10.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/20",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-10-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/19",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
index 31a2de7f71f..c965fb76d84 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-11.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-11.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/22",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-11-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/21",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
index 9d5fd427a4d..49f743bfd31 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-12.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-12.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/24",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-12-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/23",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
index 1c76652448d..784800d1402 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-13.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-13.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/26",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-13-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/25",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
index 4eb3cab4f21..8decd4a0ddb 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-14.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-14.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/28",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-14-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/27",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
index e9444d6b72b..9c745eff332 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-15.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-15.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/30",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-15-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/29",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
index ea1f86e9088..befb39acd61 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-16.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-16.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/32",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-16-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/31",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
index 0463279420c..0dd9733b5ed 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-17.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-17.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/34",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-17-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/33",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
index 1ba4e9ce9a5..ef2d7a54db7 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-18.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-18.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/36",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-18-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/35",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
index b8f559457c9..727f9a54364 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-19.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-19.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/38",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-19-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/37",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
index 6ac85c2b9eb..61436933292 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-2.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-2.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/4",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-2-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/3",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
index 659b805ec4f..3a9db86797e 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-20.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-20.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/40",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-20-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/39",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
index fc43f38a7fd..7d616e29536 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-21.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-21.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/42",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-21-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/41",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
index 276df307028..af315bd12a6 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-22.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-22.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/44",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-22-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/43",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
index 1d76238012a..8f44c70d871 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-23.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-23.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/46",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-23-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/45",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
index 0f384fc56f6..62a2f6e4c51 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-24.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-24.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/48",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-24-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/47",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
index e1f83f89d62..0951de52a51 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-25.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-25.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet2/2",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-25-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet2/1",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
index b1c41b4800f..254d50b7108 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-26.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-26.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet2/4",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-26-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet2/3",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
index b7f28932b3f..67511058b11 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-27.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-27.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet2/6",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-27-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet2/5",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
index d2fe10c921b..54cd68e4d9c 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-28.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-28.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet2/8",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-28-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet2/7",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
index d1afeeab9e3..fc4db728faa 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-3.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-3.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/6",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-3-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/5",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
index 9466d6f3388..4912b9031b8 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-4.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-4.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/8",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-4-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/7",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
index c52ba228a45..09bbf3e6929 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-5.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-5.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/10",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-5-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/9",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
index ef11ad0195c..11f58c3da7f 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-6.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-6.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/12",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-6-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/11",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
index 2ff7a3336fc..4cf86888629 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-7.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-7.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/14",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-7-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/13",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
index ed4c8e68250..2eb17d51b26 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-8.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-8.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/16",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-8-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/15",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
index b27fca7989b..97f2d4d9873 100644
--- a/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
+++ b/data/grid5000/sites/rennes/clusters/parasilo/nodes/parasilo-9.json
@@ -82,7 +82,7 @@
       "name": "eno1",
       "network_address": "parasilo-9.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/18",
       "vendor": "Intel"
     },
@@ -102,7 +102,7 @@
       "name": "eno2",
       "network_address": "parasilo-9-eth1.rennes.grid5000.fr",
       "rate": 10000000000,
-      "switch": "gw-rennes",
+      "switch": "gw",
       "switch_port": "Ethernet1/17",
       "vendor": "Intel"
     },
diff --git a/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json b/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
index bf831519dc0..3b7e71315de 100644
--- a/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
+++ b/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
@@ -1,15 +1,16 @@
 {
   "backplane_bps": 1280000000000,
+  "ip": "172.17.111.203",
   "kind": "switch",
   "linecards": [
     {
       "kavlan_pattern": "%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
           "kind": "switch",
           "port": "1:3",
+          "snmp_name": "0",
           "uid": "c6509"
         },
         {
@@ -33,8 +34,8 @@
         {
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "11",
           "uid": "srv-bigdata"
         },
         {
@@ -50,53 +51,61 @@
         {
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "18",
           "uid": "ceph3"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "19",
           "uid": "ceph2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "20",
           "uid": "paranoia-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "21",
           "uid": "paranoia-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "22",
           "uid": "paranoia-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "23",
           "uid": "paranoia-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "24",
           "uid": "paranoia-4"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "25",
           "uid": "paranoia-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "26",
           "uid": "paranoia-8"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "27",
           "uid": "paranoia-7"
         },
         {
@@ -110,21 +119,25 @@
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "32",
           "uid": "paranoia-6"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "33",
           "uid": "paranoia-5"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "34",
           "uid": "paranoia-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "35",
           "uid": "paranoia-1"
         },
         {
@@ -140,33 +153,37 @@
         {
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "42",
           "uid": "ceph1"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "43",
           "uid": "ceph0"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "44",
           "uid": "paranoia-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "45",
           "uid": "paranoia-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "46",
           "uid": "paranoia-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "47",
           "uid": "paranoia-1"
         }
       ],
@@ -175,25 +192,10 @@
     }
   ],
   "model": "Force10 S4810",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "rennes",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "bigdata-sw",
-  "vlans": {
-    "vlan101": {
-      "addresses": [
-        "172.17.111.203"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "2018-10-01",
-  "weathermap": {
-  }
+  "warranty": "2018-10-01"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/network_equipments/c6509.json b/data/grid5000/sites/rennes/network_equipments/c6509.json
index 320077fbefe..f78b467ec90 100644
--- a/data/grid5000/sites/rennes/network_equipments/c6509.json
+++ b/data/grid5000/sites/rennes/network_equipments/c6509.json
@@ -1,5 +1,6 @@
 {
   "backplane_bps": 720000000000,
+  "ip": "172.17.111.207",
   "kind": "switch",
   "linecards": [
     {
@@ -17,10 +18,12 @@
         {
           "kind": "router",
           "port": "Ethernet2/23",
-          "uid": "gw-rennes"
+          "snmp_name": "TenGigabitEthernet1/2",
+          "uid": "gw"
         },
         {
           "kind": "switch",
+          "snmp_name": "TenGigabitEthernet1/3",
           "uid": "bigdata-sw"
         }
       ],
@@ -32,7 +35,6 @@
       "kavlan_pattern": "Gi%LINECARD%/%PORT%",
       "kind": "node",
       "model": "WS-X6748-GE-TX",
-      "port": "eth2",
       "ports": [
         {
         },
@@ -119,41 +121,49 @@
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Gi2/41",
           "uid": "paranoia-1"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Gi2/42",
           "uid": "paranoia-2"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Gi2/43",
           "uid": "paranoia-3"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Gi2/44",
           "uid": "paranoia-4"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Gi2/45",
           "uid": "paranoia-5"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Gi2/46",
           "uid": "paranoia-6"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Gi2/47",
           "uid": "paranoia-7"
         },
         {
           "kind": "node",
           "port": "eth2",
+          "snmp_name": "Gi2/48",
           "uid": "paranoia-8"
         }
       ],
@@ -165,73 +175,85 @@
       "kavlan_pattern": "Gi%LINECARD%/%PORT%",
       "kind": "node",
       "model": "WS-X6748-GE-TX",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/1",
           "uid": "parapide-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/2",
           "uid": "parapide-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/3",
           "uid": "parapide-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/4",
           "uid": "parapide-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/5",
           "uid": "parapide-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/6",
           "uid": "parapide-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/7",
           "uid": "parapide-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/8",
           "uid": "parapide-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/9",
           "uid": "parapide-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/10",
           "uid": "parapide-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/11",
           "uid": "parapide-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/12",
           "uid": "parapide-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/13",
           "uid": "parapide-13"
         },
         {
@@ -239,36 +261,43 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/15",
           "uid": "parapide-16"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/16",
           "uid": "parapide-18"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/17",
           "uid": "parapide-19"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/18",
           "uid": "parapide-20"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/19",
           "uid": "parapide-21"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/20",
           "uid": "parapide-24"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Gi3/21",
           "uid": "parapide-25"
         }
       ],
@@ -280,98 +309,115 @@
       "kavlan_pattern": "Gi%LINECARD%/%PORT%",
       "kind": "node",
       "model": "WS-X6748-GE-TX",
-      "port": "eth1",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/1",
           "uid": "parapluie-1"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/2",
           "uid": "parapluie-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/3",
           "uid": "parapluie-8"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/4",
           "uid": "parapluie-9"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/5",
           "uid": "parapluie-11"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/6",
           "uid": "parapluie-12"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/7",
           "uid": "parapluie-13"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/8",
           "uid": "parapluie-15"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/9",
           "uid": "parapluie-19"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/10",
           "uid": "parapluie-20"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/11",
           "uid": "parapluie-21"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/12",
           "uid": "parapluie-22"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/13",
           "uid": "parapluie-25"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/14",
           "uid": "parapluie-28"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/15",
           "uid": "parapluie-31"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/16",
           "uid": "parapluie-32"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/17",
           "uid": "parapluie-35"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Gi4/18",
           "uid": "parapluie-38"
         }
       ],
@@ -380,17 +426,10 @@
     }
   ],
   "model": "Cisco WS-C6509-E",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "rennes",
   "snmp_community": "privkavlan",
   "type": "network_equipment",
   "uid": "c6509",
-  "warranty": "expired",
-  "weathermap": {
-  }
+  "warranty": "expired"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/network_equipments/gw-rennes.json b/data/grid5000/sites/rennes/network_equipments/gw.json
similarity index 72%
rename from data/grid5000/sites/rennes/network_equipments/gw-rennes.json
rename to data/grid5000/sites/rennes/network_equipments/gw.json
index eaaccbb3ba2..9d8a6e98c50 100644
--- a/data/grid5000/sites/rennes/network_equipments/gw-rennes.json
+++ b/data/grid5000/sites/rennes/network_equipments/gw.json
@@ -1,281 +1,348 @@
 {
+  "alias": [
+    {
+      "ip": "172.17.111.204",
+      "name": "parasilo-sw-1"
+    },
+    "gw-rennes"
+  ],
   "backplane_bps": 1440000000000,
+  "channels": {
+    "port-channel2": {
+      "kind": "switch",
+      "port": "port-channel1",
+      "rate": 80000000000,
+      "uid": "paravance-sw-1"
+    },
+    "port-channel3": {
+      "kind": "switch",
+      "port": "port-channel4",
+      "rate": 80000000000,
+      "uid": "paravance-sw-2"
+    }
+  },
+  "ip": "172.16.111.254",
   "kind": "router",
   "linecards": [
     {
     },
     {
       "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+      "kind": "node",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/1",
           "uid": "parasilo-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/2",
           "uid": "parasilo-1"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/3",
           "uid": "parasilo-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/4",
           "uid": "parasilo-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/5",
           "uid": "parasilo-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/6",
           "uid": "parasilo-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/7",
           "uid": "parasilo-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/8",
           "uid": "parasilo-4"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/9",
           "uid": "parasilo-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/10",
           "uid": "parasilo-5"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/11",
           "uid": "parasilo-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/12",
           "uid": "parasilo-6"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/13",
           "uid": "parasilo-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/14",
           "uid": "parasilo-7"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/15",
           "uid": "parasilo-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/16",
           "uid": "parasilo-8"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/17",
           "uid": "parasilo-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/18",
           "uid": "parasilo-9"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/19",
           "uid": "parasilo-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/20",
           "uid": "parasilo-10"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/21",
           "uid": "parasilo-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/22",
           "uid": "parasilo-11"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/23",
           "uid": "parasilo-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/24",
           "uid": "parasilo-12"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/25",
           "uid": "parasilo-13"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/26",
           "uid": "parasilo-13"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/27",
           "uid": "parasilo-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/28",
           "uid": "parasilo-14"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/29",
           "uid": "parasilo-15"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/30",
           "uid": "parasilo-15"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/31",
           "uid": "parasilo-16"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/32",
           "uid": "parasilo-16"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/33",
           "uid": "parasilo-17"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/34",
           "uid": "parasilo-17"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/35",
           "uid": "parasilo-18"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/36",
           "uid": "parasilo-18"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/37",
           "uid": "parasilo-19"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/38",
           "uid": "parasilo-19"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/39",
           "uid": "parasilo-20"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/40",
           "uid": "parasilo-20"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/41",
           "uid": "parasilo-21"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/42",
           "uid": "parasilo-21"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/43",
           "uid": "parasilo-22"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/44",
           "uid": "parasilo-22"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/45",
           "uid": "parasilo-23"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/46",
           "uid": "parasilo-23"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/47",
           "uid": "parasilo-24"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/48",
           "uid": "parasilo-24"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/51",
+          "kind": "channel",
           "rate": 40000000000,
-          "uid": "paravance-sw-2"
+          "snmp_name": "Ethernet1/49",
+          "uid": "port-channel3"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/52",
+          "kind": "channel",
           "rate": 40000000000,
-          "uid": "paravance-sw-2"
+          "snmp_name": "Ethernet1/50",
+          "uid": "port-channel3"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/49",
+          "kind": "channel",
           "rate": 40000000000,
-          "uid": "paravance-sw-1"
+          "snmp_name": "Ethernet1/51",
+          "uid": "port-channel2"
         },
         {
-          "aggregation": "lacp",
-          "kind": "switch",
-          "port": "Ethernet1/50",
+          "kind": "channel",
           "rate": 40000000000,
-          "uid": "paravance-sw-1"
+          "snmp_name": "Ethernet1/52",
+          "uid": "port-channel2"
         }
       ],
       "rate": 10000000000,
@@ -283,47 +350,56 @@
     },
     {
       "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+      "kind": "node",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/1",
           "uid": "parasilo-25"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/2",
           "uid": "parasilo-25"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/3",
           "uid": "parasilo-26"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/4",
           "uid": "parasilo-26"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/5",
           "uid": "parasilo-27"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/6",
           "uid": "parasilo-27"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/7",
           "uid": "parasilo-28"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/8",
           "uid": "parasilo-28"
         },
         {
@@ -357,10 +433,12 @@
         {
           "kind": "switch",
           "port": "TenGigabitEthernet1/2",
+          "snmp_name": "Ethernet2/23",
           "uid": "c6509"
         },
         {
-          "kind": "virtual",
+          "kind": "backbone",
+          "snmp_name": "Ethernet2/24",
           "uid": "renater-rennes"
         }
       ],
@@ -369,16 +447,11 @@
     }
   ],
   "model": "Nexus 56128P",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 10
-    }
-  },
+  "role": "production",
   "site": "rennes",
   "snmp_community": "public",
   "type": "network_equipment",
-  "uid": "gw-rennes",
+  "uid": "gw",
   "vlans": {
     "vlan100": {
       "addresses": [
@@ -458,7 +531,5 @@
       "name": "kavlan-16"
     }
   },
-  "warranty": "2018-04-01",
-  "weathermap": {
-  }
+  "warranty": "2018-04-01"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json b/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
index e5671b28ef6..14a688f5f86 100644
--- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
+++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
@@ -1,267 +1,323 @@
 {
   "backplane_bps": 1440000000000,
+  "channels": {
+    "port-channel1": {
+      "kind": "router",
+      "port": "port-channel2",
+      "rate": 80000000000,
+      "uid": "gw"
+    }
+  },
+  "ip": "172.17.111.206",
   "kind": "switch",
   "linecards": [
     {
     },
     {
       "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+      "kind": "node",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/1",
           "uid": "paravance-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/2",
           "uid": "paravance-1"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/3",
           "uid": "paravance-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/4",
           "uid": "paravance-2"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/5",
           "uid": "paravance-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/6",
           "uid": "paravance-3"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/7",
           "uid": "paravance-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/8",
           "uid": "paravance-4"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/9",
           "uid": "paravance-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/10",
           "uid": "paravance-5"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/11",
           "uid": "paravance-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/12",
           "uid": "paravance-6"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/13",
           "uid": "paravance-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/14",
           "uid": "paravance-7"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/15",
           "uid": "paravance-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/16",
           "uid": "paravance-8"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/17",
           "uid": "paravance-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/18",
           "uid": "paravance-9"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/19",
           "uid": "paravance-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/20",
           "uid": "paravance-10"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/21",
           "uid": "paravance-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/22",
           "uid": "paravance-11"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/23",
           "uid": "paravance-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/24",
           "uid": "paravance-12"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/25",
           "uid": "paravance-13"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/26",
           "uid": "paravance-13"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/27",
           "uid": "paravance-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/28",
           "uid": "paravance-14"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/29",
           "uid": "paravance-15"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/30",
           "uid": "paravance-15"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/31",
           "uid": "paravance-16"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/32",
           "uid": "paravance-16"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/33",
           "uid": "paravance-17"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/34",
           "uid": "paravance-17"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/35",
           "uid": "paravance-18"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/36",
           "uid": "paravance-18"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/37",
           "uid": "paravance-19"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/38",
           "uid": "paravance-19"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/39",
           "uid": "paravance-20"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/40",
           "uid": "paravance-20"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/41",
           "uid": "paravance-21"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/42",
           "uid": "paravance-21"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/43",
           "uid": "paravance-22"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/44",
           "uid": "paravance-22"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/45",
           "uid": "paravance-23"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/46",
           "uid": "paravance-23"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/47",
           "uid": "paravance-24"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/48",
           "uid": "paravance-24"
         },
         {
-          "aggregation": "lacp",
-          "kind": "router",
-          "port": "Ethernet1/51",
+          "kind": "channel",
           "rate": 40000000000,
-          "uid": "gw-rennes"
+          "snmp_name": "Ethernet1/49",
+          "uid": "port-channel1"
         },
         {
-          "aggregation": "lacp",
-          "kind": "router",
-          "port": "Ethernet1/52",
+          "kind": "channel",
           "rate": 40000000000,
-          "uid": "gw-rennes"
+          "snmp_name": "Ethernet1/50",
+          "uid": "port-channel1"
         }
       ],
       "rate": 10000000000,
@@ -269,127 +325,152 @@
     },
     {
       "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+      "kind": "node",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/1",
           "uid": "paravance-25"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/2",
           "uid": "paravance-25"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/3",
           "uid": "paravance-26"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/4",
           "uid": "paravance-26"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/5",
           "uid": "paravance-27"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/6",
           "uid": "paravance-27"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/7",
           "uid": "paravance-28"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/8",
           "uid": "paravance-28"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/9",
           "uid": "paravance-29"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/10",
           "uid": "paravance-29"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/11",
           "uid": "paravance-30"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/12",
           "uid": "paravance-30"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/13",
           "uid": "paravance-31"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/14",
           "uid": "paravance-31"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/15",
           "uid": "paravance-32"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/16",
           "uid": "paravance-32"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/17",
           "uid": "paravance-33"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/18",
           "uid": "paravance-33"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/19",
           "uid": "paravance-34"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/20",
           "uid": "paravance-34"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/21",
           "uid": "paravance-35"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/22",
           "uid": "paravance-35"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/23",
           "uid": "paravance-36"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/24",
           "uid": "paravance-36"
         }
       ],
@@ -398,17 +479,10 @@
     }
   ],
   "model": "Nexus 56128P",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "rennes",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "paravance-sw-1",
-  "warranty": "2018-04-01",
-  "weathermap": {
-  }
+  "warranty": "2018-04-01"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json b/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
index 61c7cb796bd..fb0ef20b4be 100644
--- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
+++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
@@ -1,252 +1,310 @@
 {
   "backplane_bps": 1440000000000,
+  "channels": {
+    "port-channel4": {
+      "kind": "router",
+      "port": "port-channel3",
+      "rate": 80000000000,
+      "uid": "gw"
+    }
+  },
+  "ip": "172.17.111.205",
   "kind": "switch",
   "linecards": [
     {
     },
     {
       "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+      "kind": "node",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/1",
           "uid": "paravance-37"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/2",
           "uid": "paravance-37"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/3",
           "uid": "paravance-38"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/4",
           "uid": "paravance-38"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/5",
           "uid": "paravance-39"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/6",
           "uid": "paravance-39"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/7",
           "uid": "paravance-40"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/8",
           "uid": "paravance-40"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/9",
           "uid": "paravance-41"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/10",
           "uid": "paravance-41"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/11",
           "uid": "paravance-42"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/12",
           "uid": "paravance-42"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/13",
           "uid": "paravance-43"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/14",
           "uid": "paravance-43"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/15",
           "uid": "paravance-44"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/16",
           "uid": "paravance-44"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/17",
           "uid": "paravance-45"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/18",
           "uid": "paravance-45"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/19",
           "uid": "paravance-46"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/20",
           "uid": "paravance-46"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/21",
           "uid": "paravance-47"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/22",
           "uid": "paravance-47"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/23",
           "uid": "paravance-48"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/24",
           "uid": "paravance-48"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/25",
           "uid": "paravance-49"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/26",
           "uid": "paravance-49"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/27",
           "uid": "paravance-50"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/28",
           "uid": "paravance-50"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/29",
           "uid": "paravance-51"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/30",
           "uid": "paravance-51"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/31",
           "uid": "paravance-52"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/32",
           "uid": "paravance-52"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/33",
           "uid": "paravance-53"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/34",
           "uid": "paravance-53"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/35",
           "uid": "paravance-54"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/36",
           "uid": "paravance-54"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/37",
           "uid": "paravance-55"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/38",
           "uid": "paravance-55"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/39",
           "uid": "paravance-56"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/40",
           "uid": "paravance-56"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/41",
           "uid": "paravance-57"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/42",
           "uid": "paravance-57"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/43",
           "uid": "paravance-58"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/44",
           "uid": "paravance-58"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/45",
           "uid": "paravance-59"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/46",
           "uid": "paravance-59"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet1/47",
           "uid": "paravance-60"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet1/48",
           "uid": "paravance-60"
         },
         {
@@ -254,18 +312,16 @@
         {
         },
         {
-          "aggregation": "lacp",
-          "kind": "router",
-          "port": "Ethernet1/49",
+          "kind": "channel",
           "rate": 40000000000,
-          "uid": "gw-rennes"
+          "snmp_name": "Ethernet1/51",
+          "uid": "port-channel4"
         },
         {
-          "aggregation": "lacp",
-          "kind": "router",
-          "port": "Ethernet1/50",
+          "kind": "channel",
           "rate": 40000000000,
-          "uid": "gw-rennes"
+          "snmp_name": "Ethernet1/52",
+          "uid": "port-channel4"
         }
       ],
       "rate": 10000000000,
@@ -273,127 +329,152 @@
     },
     {
       "kavlan_pattern": "Ethernet%LINECARD%/%PORT%",
+      "kind": "node",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/1",
           "uid": "paravance-61"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/2",
           "uid": "paravance-61"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/3",
           "uid": "paravance-62"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/4",
           "uid": "paravance-62"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/5",
           "uid": "paravance-63"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/6",
           "uid": "paravance-63"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/7",
           "uid": "paravance-64"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/8",
           "uid": "paravance-64"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/9",
           "uid": "paravance-65"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/10",
           "uid": "paravance-65"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/11",
           "uid": "paravance-66"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/12",
           "uid": "paravance-66"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/13",
           "uid": "paravance-67"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/14",
           "uid": "paravance-67"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/15",
           "uid": "paravance-68"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/16",
           "uid": "paravance-68"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/17",
           "uid": "paravance-69"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/18",
           "uid": "paravance-69"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/19",
           "uid": "paravance-70"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/20",
           "uid": "paravance-70"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/21",
           "uid": "paravance-71"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/22",
           "uid": "paravance-71"
         },
         {
           "kind": "node",
           "port": "eth1",
+          "snmp_name": "Ethernet2/23",
           "uid": "paravance-72"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Ethernet2/24",
           "uid": "paravance-72"
         }
       ],
@@ -402,17 +483,10 @@
     }
   ],
   "model": "Nexus 56128P",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "rennes",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "paravance-sw-2",
-  "warranty": "2018-04-01",
-  "weathermap": {
-  }
+  "warranty": "2018-04-01"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
index 4b160d90805..bcff18bfcbf 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-1.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/10",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
index 05e0683e0e6..1664b1a06de 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
@@ -62,7 +62,7 @@
       "name": "eno1",
       "network_address": "suno-10.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/3",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
index f81ea775119..d3e9a4ca784 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-11.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/2",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
index 2b0902a9e5c..259eda0b448 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-12.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/6",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
index 40c601ea071..b57ea487c53 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-13.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/13",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
index cf8b7638e43..d9b25dc3734 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-14.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/19",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
index 893ff14f8d1..2522ebc9baa 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-15.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/17",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
index 4addfca19e2..fc91f87204f 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
@@ -62,7 +62,7 @@
       "name": "eno1",
       "network_address": "suno-16.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/21",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
index 6e3be4f0787..3e26a357672 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
@@ -62,7 +62,7 @@
       "name": "eno1",
       "network_address": "suno-17.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/15",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
index 9d41c0fd35f..18097f9ee5a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-18.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/1",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
index 31fd52ac3db..10f3dd8f9a2 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-19.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/2",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
index f458fabf31a..a347871595a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-2.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/11",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
index 798782918b8..de87c6eb5a5 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-20.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/3",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
index 608156acb47..8e975215804 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
@@ -62,7 +62,7 @@
       "name": "eno1",
       "network_address": "suno-21.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/4",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
index 44d1ad89f54..3ebfc55bc64 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-22.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/5",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
index a91e546fc83..550be70b259 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-23.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/6",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
index 92fda191386..72b9e27410d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-24.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/7",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
index 4c1810d83db..c597ae34d1f 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-25.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/8",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
index 73f820a62cf..e5903bfa531 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-26.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/9",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
index 2b3302acd56..a1fee948a70 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-27.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/10",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
index 79bc29e08ec..8b9b9562c4a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-28.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/11",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
index a537fc81091..fc256acbe00 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-29.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/12",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
index 3a732955e72..6572e6fa894 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
@@ -62,7 +62,7 @@
       "name": "eno1",
       "network_address": "suno-3.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/1",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
index 00a0910cfe0..fbdd5454afd 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-30.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/13",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
index 6a833af27c0..e489a8d2f34 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-31.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/14",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
index ae0a89a7fec..ad9017888d5 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-32.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/15",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
index bee7947c7a9..b97af138b1c 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-33.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/16",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
index 87146dcb2e4..0818c55186d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-34.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/17",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
index e7dae5a6652..18cb1ac3c64 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-35.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet6/18",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
index bddbb3a7f09..838fc5ddffa 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-36.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet7/1",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
index 57eefb1cf03..e995aa76dc3 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-37.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet7/2",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
index ca117f5a9ed..f895e3d203a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
@@ -62,7 +62,7 @@
       "name": "eno1",
       "network_address": "suno-38.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet7/3",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
index dfc5b407879..ab2c24c8b31 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
@@ -62,7 +62,7 @@
       "name": "eno1",
       "network_address": "suno-39.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet7/4",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
index 5b86780cfbc..554e1280e68 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-4.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/5",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
index 1df7f548abd..bf8e4adbf20 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
@@ -62,7 +62,7 @@
       "name": "eno1",
       "network_address": "suno-40.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet7/5",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
index 2e28e0b78df..9b42b520d9a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
@@ -62,7 +62,7 @@
       "name": "eno1",
       "network_address": "suno-41.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet7/6",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
index 22e88b6835e..6c66f4f6c64 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-42.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet7/7",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
index f52d379d3cb..fc0b2ea8473 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-43.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet7/8",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
index e25f58ece5b..66275bfe294 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-44.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet7/9",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
index c94135d4bb2..05229104559 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
@@ -62,7 +62,7 @@
       "name": "eno1",
       "network_address": "suno-45.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet7/10",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
index 920bc2411cb..19fb1f299d0 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
@@ -62,7 +62,7 @@
       "name": "eno1",
       "network_address": "suno-5.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/4",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
index acd925230e8..f3121feb6e0 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
@@ -62,7 +62,7 @@
       "name": "eno1",
       "network_address": "suno-6.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/7",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
index 97c4867f6d4..21ec218d443 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-7.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/8",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
index 8bed2ed83b8..368053706f5 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-8.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/12",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
index 25fb1ae2419..7db5ee1dfd3 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
@@ -63,7 +63,7 @@
       "name": "eno1",
       "network_address": "suno-9.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw-sophia",
+      "switch": "gw",
       "switch_port": "GigabitEthernet5/9",
       "vendor": "Broadcom"
     },
diff --git a/data/grid5000/sites/sophia/network_equipments/edgeiron.json b/data/grid5000/sites/sophia/network_equipments/edgeiron.json
deleted file mode 100644
index 55c742e2f07..00000000000
--- a/data/grid5000/sites/sophia/network_equipments/edgeiron.json
+++ /dev/null
@@ -1,225 +0,0 @@
-{
-  "backplane_bps": 40000000000,
-  "kind": "switch",
-  "linecards": [
-    {
-      "kavlan_pattern": "GigabitEthernet%LINECARD%/%PORT%",
-      "kind": "router",
-      "ports": [
-        {
-        },
-        {
-          "kind": "router",
-          "port": "ethernet2/1",
-          "uid": "gw-sophia"
-        },
-        {
-          "kind": "router",
-          "port": "ethernet2/2",
-          "uid": "gw-sophia"
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
-    },
-    {
-      "kavlan_pattern": "GigabitEthernet%LINECARD%/%PORT%",
-      "kind": "node",
-      "ports": [
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
-    },
-    {
-    },
-    {
-      "kavlan_pattern": "GigabitEthernet%LINECARD%/%PORT%",
-      "kind": "node",
-      "ports": [
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        },
-        {
-        }
-      ],
-      "rate": 1000000000,
-      "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
-    }
-  ],
-  "model": "Foundry",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
-  "site": "sophia",
-  "snmp_community": "public",
-  "type": "network_equipment",
-  "uid": "edgeiron",
-  "vlans": {
-    "vlan100": {
-      "addresses": [
-        "172.16.143.250"
-      ],
-      "administrative": true
-    }
-  },
-  "warranty": "expired",
-  "weathermap": {
-    "use_cacti": "no"
-  }
-}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/gw-sophia.json b/data/grid5000/sites/sophia/network_equipments/gw.json
similarity index 71%
rename from data/grid5000/sites/sophia/network_equipments/gw-sophia.json
rename to data/grid5000/sites/sophia/network_equipments/gw.json
index 277b9ae98e5..dbfd8b48c1e 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw-sophia.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -1,5 +1,9 @@
 {
+  "alias": [
+    "gw-sophia"
+  ],
   "backplane_bps": 900000000000,
+  "ip": "172.16.143.254",
   "kind": "router",
   "linecards": [
     {
@@ -11,12 +15,14 @@
         {
         },
         {
-          "kind": "other",
+          "kind": "backbone",
+          "snmp_name": "10GigabitEthernet1/1",
           "uid": "renater5-FON"
         },
         {
           "kind": "switch",
           "port": "0/5",
+          "snmp_name": "10GigabitEthernet1/2",
           "uid": "swx1nef"
         }
       ],
@@ -24,24 +30,6 @@
       "snmp_pattern": "10GigabitEthernet%LINECARD%/%PORT%"
     },
     {
-      "backplane_bps": 20000000000,
-      "kind": "switch",
-      "ports": [
-        {
-        },
-        {
-          "kind": "switch",
-          "port": "0/1",
-          "uid": "edgeiron"
-        },
-        {
-          "kind": "switch",
-          "port": "0/2",
-          "uid": "edgeiron"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "10GigabitEthernet%LINECARD%/%PORT%"
     },
     {
     },
@@ -58,66 +46,79 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/1",
           "uid": "suno-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/2",
           "uid": "suno-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/3",
           "uid": "suno-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/4",
           "uid": "suno-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/5",
           "uid": "suno-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/6",
           "uid": "suno-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/7",
           "uid": "suno-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/8",
           "uid": "suno-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/9",
           "uid": "suno-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/10",
           "uid": "suno-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/11",
           "uid": "suno-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/12",
           "uid": "suno-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/13",
           "uid": "suno-13"
         },
         {
@@ -125,6 +126,7 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/15",
           "uid": "suno-17"
         },
         {
@@ -132,6 +134,7 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/17",
           "uid": "suno-15"
         },
         {
@@ -139,6 +142,7 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/19",
           "uid": "suno-14"
         },
         {
@@ -146,6 +150,7 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet5/21",
           "uid": "suno-16"
         }
       ],
@@ -163,122 +168,146 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/1",
           "uid": "suno-18"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/2",
           "uid": "suno-19"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/3",
           "uid": "suno-20"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/4",
           "uid": "suno-21"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/5",
           "uid": "suno-22"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/6",
           "uid": "suno-23"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/7",
           "uid": "suno-24"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/8",
           "uid": "suno-25"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/9",
           "uid": "suno-26"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/10",
           "uid": "suno-27"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/11",
           "uid": "suno-28"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/12",
           "uid": "suno-29"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/13",
           "uid": "suno-30"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/14",
           "uid": "suno-31"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/15",
           "uid": "suno-32"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/16",
           "uid": "suno-33"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/17",
           "uid": "suno-34"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet6/18",
           "uid": "suno-35"
         },
         {
-          "kind": "other",
-          "port": "eth2",
-          "uid": "srv-stock"
+          "kind": "server",
+          "port": "eth0",
+          "snmp_name": "GigabitEthernet6/19",
+          "uid": "srv-stock-eth2"
         },
         {
-          "kind": "other",
-          "port": "eth1",
-          "uid": "srv"
+          "kind": "server",
+          "port": "eth0",
+          "snmp_name": "GigabitEthernet6/20",
+          "uid": "srv-eth1"
         },
         {
-          "kind": "other",
-          "port": "eth3",
-          "uid": "srv"
+          "kind": "server",
+          "port": "eth0",
+          "snmp_name": "GigabitEthernet6/21",
+          "uid": "srv-eth3"
         },
         {
-          "kind": "other",
-          "port": "eth2",
-          "uid": "srv"
+          "kind": "server",
+          "port": "eth0",
+          "snmp_name": "GigabitEthernet6/22",
+          "uid": "srv-eth2"
         },
         {
-          "kind": "other",
-          "port": "eth3",
-          "uid": "srv-stock"
+          "kind": "server",
+          "port": "eth0",
+          "snmp_name": "GigabitEthernet6/23",
+          "uid": "srv-stock-eth3"
         },
         {
-          "kind": "other",
-          "port": "eth1",
-          "uid": "srv-stock"
+          "kind": "server",
+          "port": "eth0",
+          "snmp_name": "GigabitEthernet6/24",
+          "uid": "srv-stock-eth1"
         }
       ],
       "rate": 1000000000,
@@ -288,58 +317,67 @@
       "backplane_bps": 24000000000,
       "kavlan_pattern": "%LINECARD%/%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet7/1",
           "uid": "suno-36"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet7/2",
           "uid": "suno-37"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet7/3",
           "uid": "suno-38"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet7/4",
           "uid": "suno-39"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet7/5",
           "uid": "suno-40"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet7/6",
           "uid": "suno-41"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet7/7",
           "uid": "suno-42"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet7/8",
           "uid": "suno-43"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet7/9",
           "uid": "suno-44"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "GigabitEthernet7/10",
           "uid": "suno-45"
         },
         {
@@ -357,9 +395,9 @@
         {
         },
         {
-          "kind": "other",
-          "port": "eth1",
-          "uid": "srv2"
+          "kind": "server",
+          "snmp_name": "GigabitEthernet7/18",
+          "uid": "srv2-eth1"
         },
         {
         },
@@ -370,13 +408,13 @@
         {
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "GigabitEthernet7/23",
           "uid": "srv"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "GigabitEthernet7/24",
           "uid": "srv-stock"
         }
       ],
@@ -411,16 +449,16 @@
         {
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "GigabitEthernet9/10",
           "uid": "stock"
         },
         {
         },
         {
-          "kind": "other",
-          "port": "eth1",
-          "uid": "stock"
+          "kind": "server",
+          "snmp_name": "GigabitEthernet9/12",
+          "uid": "stock-eth1"
         }
       ],
       "rate": 1000000000,
@@ -428,16 +466,11 @@
     }
   ],
   "model": "Foundry",
-  "sensors": {
-    "network": {
-      "available": true,
-      "resolution": 1
-    }
-  },
+  "role": "production",
   "site": "sophia",
   "snmp_community": "g5kadmin",
   "type": "network_equipment",
-  "uid": "gw-sophia",
+  "uid": "gw",
   "vlans": {
     "vlan100": {
       "addresses": [
@@ -541,7 +574,5 @@
       "name": "kavlan-18"
     }
   },
-  "warranty": "expired",
-  "weathermap": {
-  }
+  "warranty": "expired"
 }
\ 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
index 9f14224ab29..3f052b5fb30 100644
--- a/data/grid5000/sites/sophia/network_equipments/swx1nef.json
+++ b/data/grid5000/sites/sophia/network_equipments/swx1nef.json
@@ -18,7 +18,8 @@
         {
           "kind": "router",
           "port": "1/2",
-          "uid": "gw-sophia"
+          "snmp_name": "Port: 5 Gigabit",
+          "uid": "gw"
         },
         {
         },
@@ -47,11 +48,13 @@
         {
           "kind": "switch",
           "port": "0/103",
+          "snmp_name": "Port: 18 Gigabit",
           "uid": "swy1nef"
         },
         {
           "kind": "other",
           "port": "eth3",
+          "snmp_name": "Port: 19 Gigabit",
           "uid": "srv3"
         }
       ],
@@ -60,11 +63,10 @@
     }
   ],
   "model": "Juniper EX2500-24F-FB",
+  "role": "production",
   "site": "sophia",
   "snmp_community": "g5kadmin",
   "type": "network_equipment",
   "uid": "swx1nef",
-  "warranty": "expired",
-  "weathermap": {
-  }
+  "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
index e512a16ea89..6cdf076f6ea 100644
--- a/data/grid5000/sites/sophia/network_equipments/swy1nef.json
+++ b/data/grid5000/sites/sophia/network_equipments/swy1nef.json
@@ -1,11 +1,11 @@
 {
   "backplane_bps": 184000000000,
+  "ip": "172.16.143.249",
   "kind": "switch",
   "linecards": [
     {
       "kavlan_pattern": "%PORT%",
       "kind": "node",
-      "port": "eth0",
       "ports": [
         {
         },
@@ -116,16 +116,19 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 53 Gigabit",
           "uid": "uvb-27"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 54 Gigabit",
           "uid": "uvb-39"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 55 Gigabit",
           "uid": "uvb-44"
         },
         {
@@ -133,191 +136,228 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 57 Gigabit",
           "uid": "uvb-43"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 58 Gigabit",
           "uid": "uvb-40"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 59 Gigabit",
           "uid": "uvb-32"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 60 Gigabit",
           "uid": "uvb-26"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 61 Gigabit",
           "uid": "uvb-25"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 62 Gigabit",
           "uid": "uvb-28"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 63 Gigabit",
           "uid": "uvb-36"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 64 Gigabit",
           "uid": "uvb-31"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 65 Gigabit",
           "uid": "uvb-30"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 66 Gigabit",
           "uid": "uvb-35"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 67 Gigabit",
           "uid": "uvb-22"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 68 Gigabit",
           "uid": "uvb-21"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 69 Gigabit",
           "uid": "uvb-24"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 70 Gigabit",
           "uid": "uvb-23"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 71 Gigabit",
           "uid": "uvb-15"
         },
         {
-          "kind": "other",
-          "port": "eth0",
+          "kind": "server",
+          "snmp_name": "Port: 72 Gigabit",
           "uid": "opensm"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 73 Gigabit",
           "uid": "uvb-19"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 74 Gigabit",
           "uid": "uvb-14"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 75 Gigabit",
           "uid": "uvb-17"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 76 Gigabit",
           "uid": "uvb-18"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 77 Gigabit",
           "uid": "uvb-20"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 78 Gigabit",
           "uid": "uvb-16"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 79 Gigabit",
           "uid": "uvb-12"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 80 Gigabit",
           "uid": "uvb-9"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 81 Gigabit",
           "uid": "uvb-10"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 82 Gigabit",
           "uid": "uvb-11"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 83 Gigabit",
           "uid": "uvb-7"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 84 Gigabit",
           "uid": "uvb-8"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 85 Gigabit",
           "uid": "uvb-5"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 86 Gigabit",
           "uid": "uvb-6"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 87 Gigabit",
           "uid": "uvb-4"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 88 Gigabit",
           "uid": "uvb-1"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 89 Gigabit",
           "uid": "uvb-3"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 90 Gigabit",
           "uid": "uvb-2"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 91 Gigabit",
           "uid": "uvb-38"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 92 Gigabit",
           "uid": "uvb-37"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 93 Gigabit",
           "uid": "uvb-34"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 94 Gigabit",
           "uid": "uvb-29"
         },
         {
@@ -325,16 +365,19 @@
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 96 Gigabit",
           "uid": "uvb-33"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 97 Gigabit",
           "uid": "uvb-41"
         },
         {
           "kind": "node",
           "port": "eth0",
+          "snmp_name": "Port: 98 Gigabit",
           "uid": "uvb-42"
         },
         {
@@ -348,6 +391,7 @@
         {
           "kind": "switch",
           "port": "0/18",
+          "snmp_name": "Port: 103 Gigabit",
           "uid": "swx1nef"
         }
       ],
@@ -356,11 +400,10 @@
     }
   ],
   "model": "Dell PowerConnect 6248",
+  "role": "production",
   "site": "sophia",
   "snmp_community": "g5kadmin",
   "type": "network_equipment",
   "uid": "swy1nef",
-  "warranty": "expired",
-  "weathermap": {
-  }
+  "warranty": "expired"
 }
\ No newline at end of file
diff --git a/input/grid5000/sites/grenoble/networks/gw.yaml b/input/grid5000/sites/grenoble/networks/gw.yaml
index 84abbdf00df..da49b8886fb 100644
--- a/input/grid5000/sites/grenoble/networks/gw.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw.yaml
@@ -1,16 +1,16 @@
 ---
 gw:
+  role: production
   model: ExtremeNetworks
   kind: router
-  alias: [sw-imag]
+  alias:
+    - sw-imag
+    - gw-grenoble
   site: grenoble
   warranty: expired
   backplane_bps: 800000000000
   snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
+  ip: 172.16.31.254
   vlans:
     "vlan100":
       administrative: yes
@@ -68,7 +68,6 @@ gw:
       kavlan_pattern: "%PORT%"
       backplane_bps: 48000000000
       kind: node
-      port: eth0
       rate: 10000000000
       ports:
         1: dahu-1
@@ -113,19 +112,19 @@ gw:
         40: troll-4
         41:
           uid: dighyp1
-          kind: other
+          kind: server
         42:
           uid: dighyp2
-          kind: other
+          kind: server
         43:
           uid: digsed
-          kind: other
+          kind: server
         44:
           uid: digsed
-          kind: other
+          kind: server
         45:
           uid: digwatt
-          kind: other
+          kind: server
         48:
           uid: renater5
-          kind: other
+          kind: backbone
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
index 54e8b78de5e..04376f94f5d 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-1.yaml
@@ -1,18 +1,16 @@
 ---
 sw-chiclet-1:
+  role: production
   model: cisco 93180YC-EX
   warranty: 2021-11-30
+  ip: 172.17.47.221
   kind: switch
   site: lille
   snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
   backplane_bps: 36000000000000
   linecards:
     1:
-      kind: virtual
+      kind: node
       snmp_pattern: Ethernet%LINECARD%/%PORT%
       kavlan_pattern: Ethernet%LINECARD%/%PORT%
       backplane_bps: 36000000000000
@@ -20,141 +18,79 @@ sw-chiclet-1:
       ports:
         1:
           uid:  chifflot-1
-          port: eth0
-          kind: node
         2:
           uid:  chifflot-2
-          port: eth0
-          kind: node
         3:
           uid:  chifflot-3
-          port: eth0
-          kind: node
         4:
           uid:  chifflot-4
-          port: eth0
-          kind: node
         5:
           uid:  chifflot-5
-          port: eth0
-          kind: node
         6:
           uid:  chifflot-6
-          port: eth0
-          kind: node
         7:
           uid:  chifflot-7
-          port: eth0
-          kind: node
         8:
           uid:  chifflot-8
-          port: eth0
-          kind: node
         9:
           uid:  chiclet-1
-          port: eth0
-          kind: node
         10:
           uid:  chiclet-2
-          port: eth0
-          kind: node
         11:
           uid:  chiclet-3
-          port: eth0
-          kind: node
         12:
           uid:  chiclet-4
-          port: eth0
-          kind: node
         13:
           uid:  chiclet-5
-          port: eth0
-          kind: node
         14:
           uid:  chiclet-6
-          port: eth0
-          kind: node
         15:
           uid:  chiclet-7
-          port: eth0
-          kind: node
         16:
           uid:  chiclet-8
-          port: eth0
-          kind: node
         17:
-          uid:  chifflot-1
-          port: eth1
-          kind: node
+          uid:  chifflot-1-eth1
         18:
-          uid:  chifflot-2
-          port: eth1
-          kind: node
+          uid:  chifflot-2-eth1
         19:
-          uid:  chifflot-3
-          port: eth1
-          kind: node
+          uid:  chifflot-3-eth1
         20:
-          uid:  chifflot-4
-          port: eth1
-          kind: node
+          uid:  chifflot-4-eth1
         21:
-          uid:  chifflot-5
-          port: eth1
-          kind: node
+          uid:  chifflot-5-eth1
         22:
-          uid:  chifflot-6
-          port: eth1
-          kind: node
+          uid:  chifflot-6-eth1
         23:
-          uid:  chifflot-7
-          port: eth1
-          kind: node
+          uid:  chifflot-7-eth1
         24:
-          uid:  chifflot-8
-          port: eth1
-          kind: node
+          uid:  chifflot-8-eth1
         25:
-          uid:  chiclet-1
-          port: eth1
-          kind: node
+          uid:  chiclet-1-eth1
         26:
-          uid:  chiclet-2
-          port: eth1
-          kind: node
+          uid:  chiclet-2-eth1
         27:
-          uid:  chiclet-3
-          port: eth1
-          kind: node
+          uid:  chiclet-3-eth1
         28:
-          uid:  chiclet-4
-          port: eth1
-          kind: node
+          uid:  chiclet-4-eth1
         29:
-          uid:  chiclet-5
-          port: eth1
-          kind: node
+          uid:  chiclet-5-eth1
         30:
-          uid:  chiclet-6
-          port: eth1
-          kind: node
+          uid:  chiclet-6-eth1
         31:
-          uid:  chiclet-7
-          port: eth1
-          kind: node
+          uid:  chiclet-7-eth1
         32:
-          uid:  chiclet-8
-          port: eth1
-          kind: node
+          uid:  chiclet-8-eth1
         53:
-          uid: sw-chiclet-2
-          kind: router
-          port: Ethernet1/52
-          aggregation: lacp
+          uid: port-channel1
+          kind: channel
           rate: 100000000000
         54:
-          uid: sw-chiclet-2
-          kind: router
-          port: Ethernet1/51
-          aggregation: lacp
+          uid: port-channel1
+          kind: channel
           rate: 100000000000
+  channels:
+    port-channel1:
+      port: port-channel1
+      uid: sw-chiclet-2
+      kind: router
+      rate: 200000000000
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
index 1f212cdc7bc..13fa90675e9 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-2.yaml
@@ -1,14 +1,17 @@
 ---
 sw-chiclet-2:
+  role: production
   model: cisco 93180YC-EX
   warranty: 2021-11-30
+  alias:
+    - name: gw
+      ip: 172.16.47.254
+    - name: gw-adm
+      ip: 172.17.47.254
+  ip: 172.17.47.222
   kind: router
   site: lille
   snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
   backplane_bps: 36000000000000
   vlans:
     "vlan100":
@@ -63,40 +66,43 @@ sw-chiclet-2:
         - 10.11.192.0/18
   linecards:
     1:
-      kind: virtual
+      kind: other
       snmp_pattern: Ethernet%LINECARD%/%PORT%
       kavlan_pattern: Ethernet%LINECARD%/%PORT%
       backplane_bps: 36000000000000
       rate: 10000000000
-      port: eth0
       ports:
         33:
           uid: renater5-FON
-          kind: other
+          kind: backbone
         35:
           uid: labo
           kind: other
+          rate: 1000000000
         51:
-          uid: sw-chiclet-1
-          kind: switch
-          port: Ethernet1/54
-          aggregation: lacp
+          uid: port-channel1
+          kind: channel
           rate: 100000000000
         52:
-          uid: sw-chiclet-1
-          kind: switch
-          port: Ethernet1/53
-          aggregation: lacp
+          uid: port-channel1
+          kind: channel
           rate: 100000000000
         53:
-          uid: sw-chiclet-3
-          kind: switch
-          port: Ethernet1/53
-          aggregation: lacp
+          uid: port-channel2
+          kind: channel
           rate: 100000000000
         54:
-          uid: sw-chiclet-3
-          kind: switch
-          port: Ethernet1/54
-          aggregation: lacp
+          uid: port-channel2
+          kind: channel
           rate: 100000000000
+  channels:
+    port-channel1:
+      port: port-channel1
+      uid: sw-chiclet-1
+      kind: switch
+      rate: 200000000000
+    port-channel2:
+      port: port-channel1
+      uid: sw-chiclet-3
+      kind: switch
+      rate: 200000000000
diff --git a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
index 0a1f4b65ff5..5fd2ff35e90 100644
--- a/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
+++ b/input/grid5000/sites/lille/networks/sw-chiclet-3.yaml
@@ -1,18 +1,16 @@
 ---
 sw-chiclet-3:
+  role: production
   model: cisco 93180YC-EX
   warranty: 2021-11-30
+  ip: 172.17.47.223
   kind: switch
   site: lille
   snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
   backplane_bps: 36000000000000
   linecards:
     1:
-      kind: virtual
+      kind: node
       snmp_pattern: Ethernet%LINECARD%/%PORT%
       kavlan_pattern: Ethernet%LINECARD%/%PORT%
       backplane_bps: 36000000000000
@@ -20,197 +18,107 @@ sw-chiclet-3:
       ports:
         1:
           uid:  chetemi-1
-          port: eth0
-          kind: node
         2:
           uid:  chetemi-2
-          port: eth0
-          kind: node
         3:
           uid:  chetemi-3
-          port: eth0
-          kind: node
         4:
           uid:  chetemi-4
-          port: eth0
-          kind: node
         5:
           uid:  chetemi-5
-          port: eth0
-          kind: node
         6:
           uid:  chetemi-6
-          port: eth0
-          kind: node
         7:
           uid:  chetemi-7
-          port: eth0
-          kind: node
         8:
           uid:  chetemi-8
-          port: eth0
-          kind: node
         9:
           uid:  chetemi-9
-          port: eth0
-          kind: node
         10:
           uid:  chetemi-10
-          port: eth0
-          kind: node
         11:
           uid:  chetemi-11
-          port: eth0
-          kind: node
         12:
           uid:  chetemi-12
-          port: eth0
-          kind: node
         13:
           uid:  chetemi-13
-          port: eth0
-          kind: node
         14:
           uid:  chetemi-14
-          port: eth0
-          kind: node
         15:
           uid:  chetemi-15
-          port: eth0
-          kind: node
         17:
           uid:  chifflet-1
-          port: eth0
-          kind: node
         18:
           uid:  chifflet-2
-          port: eth0
-          kind: node
         19:
           uid:  chifflet-3
-          port: eth0
-          kind: node
         20:
           uid:  chifflet-4
-          port: eth0
-          kind: node
         21:
           uid:  chifflet-5
-          port: eth0
-          kind: node
         22:
           uid:  chifflet-6
-          port: eth0
-          kind: node
         23:
           uid:  chifflet-7
-          port: eth0
-          kind: node
         24:
           uid:  chifflet-8
-          port: eth0
-          kind: node
         25:
-          uid:  chetemi-1
-          port: eth1
-          kind: node
+          uid:  chetemi-1-eth1
         26:
-          uid:  chetemi-2
-          port: eth1
-          kind: node
+          uid:  chetemi-2-eth1
         27:
-          uid:  chetemi-3
-          port: eth1
-          kind: node
+          uid:  chetemi-3-eth1
         28:
-          uid:  chetemi-4
-          port: eth1
-          kind: node
+          uid:  chetemi-4-eth1
         29:
-          uid:  chetemi-5
-          port: eth1
-          kind: node
+          uid:  chetemi-5-eth1
         30:
-          uid:  chetemi-6
-          port: eth1
-          kind: node
+          uid:  chetemi-6-eth1
         31:
-          uid:  chetemi-7
-          port: eth1
-          kind: node
+          uid:  chetemi-7-eth1
         32:
-          uid:  chetemi-8
-          port: eth1
-          kind: node
+          uid:  chetemi-8-eth1
         33:
-          uid:  chetemi-9
-          port: eth1
-          kind: node
+          uid:  chetemi-9-eth1
         34:
-          uid:  chetemi-10
-          port: eth1
-          kind: node
+          uid:  chetemi-10-eth1
         35:
-          uid:  chetemi-11
-          port: eth1
-          kind: node
+          uid:  chetemi-11-eth1
         36:
-          uid:  chetemi-12
-          port: eth1
-          kind: node
+          uid:  chetemi-12-eth1
         37:
-          uid:  chetemi-13
-          port: eth1
-          kind: node
+          uid:  chetemi-13-eth1
         38:
-          uid:  chetemi-14
-          port: eth1
-          kind: node
+          uid:  chetemi-14-eth1
         39:
-          uid:  chetemi-15
-          port: eth1
-          kind: node
+          uid:  chetemi-15-eth1
         40:
-          uid:  chifflet-1
-          port: eth1
-          kind: node
+          uid:  chifflet-1-eth1
         41:
-          uid:  chifflet-2
-          port: eth1
-          kind: node
+          uid:  chifflet-2-eth1
         42:
-          uid:  chifflet-3
-          port: eth1
-          kind: node
+          uid:  chifflet-3-eth1
         43:
-          uid:  chifflet-4
-          port: eth1
-          kind: node
+          uid:  chifflet-4-eth1
         44:
-          uid:  chifflet-5
-          port: eth1
-          kind: node
+          uid:  chifflet-5-eth1
         45:
-          uid:  chifflet-6
-          port: eth1
-          kind: node
+          uid:  chifflet-6-eth1
         46:
-          uid:  chifflet-7
-          port: eth1
-          kind: node
+          uid:  chifflet-7-eth1
         47:
-          uid:  chifflet-8
-          port: eth1
-          kind: node
+          uid:  chifflet-8-eth1
         53:
-          uid: sw-chiclet-2
-          kind: router
-          port: Ethernet1/53
-          aggregation: lacp
+          uid: port-channel1
+          kind: channel
           rate: 100000000000
         54:
-          uid: sw-chiclet-2
-          kind: router
-          port: Ethernet1/54
-          aggregation: lacp
+          uid: port-channel1
+          kind: channel
           rate: 100000000000
+  channels:
+    port-channel1:
+      uid: sw-chiclet-2
+      port: port-channel2
+      rate: 200000000000
+      kind: router
diff --git a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
index 72a74656af0..1cb71deccd4 100644
--- a/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
+++ b/input/grid5000/sites/luxembourg/networks/gw-luxembourg.yaml
@@ -1,15 +1,15 @@
 ---
-gw-luxembourg:
+gw:
+  role: production
   model: cisco WS-C6506-E
+  alias:
+    - gw-luxembourg
   kind: router
   site: luxembourg
   snmp_community: public
   warranty: 2018-12-01
-  sensors:
-    network:
-      available: true
-      resolution: 1
   backplane_bps: 720000000000
+  ip: 172.16.191.254
   vlans:
     "vlan50":
       addresses:
@@ -164,36 +164,27 @@ gw-luxembourg:
 #          port: bmc
 #          kind: node
         25:
-          uid: granduc-2
-          port: eth1
+          uid: granduc-2-eth1
         26:
-          uid: granduc-3
-          port: eth1
+          uid: granduc-3-eth1
         27:
-          uid: granduc-4
-          port: eth1
+          uid: granduc-4-eth1
         29:
-          uid: granduc-6
-          port: eth1
+          uid: granduc-6-eth1
         32:
-          uid: granduc-9
-          port: eth1
+          uid: granduc-9-eth1
         35:
-          uid: cronos
-          port: eth1
-          kind: other
+          uid: cronos-eth1
+          kind: server
         36:
           uid: zeus
-          port: eth0
-          kind: other
+          kind: server
         37:
-          uid: cronos
-          port: eth2
-          kind: other
+          uid: cronos-eth2
+          kind: server
         40:
-          uid: zeus
-          port: eth1
-          kind: other
+          uid: zeus-eth1
+          kind: server
         46:
 #          uid: ul-grid5000-sw02
 #          port: mgmt0
@@ -208,59 +199,41 @@ gw-luxembourg:
       ports:
         2:
           uid: granduc-2
-          port: eth0
         3:
           uid: granduc-3
-          port: eth0
         4:
           uid: granduc-4
-          port: eth0
         6:
           uid: granduc-6
-          port: eth0
         9:
           uid: granduc-9
-          port: eth0
         12:
           uid: granduc-12
-          port: eth0
         15:
           uid: granduc-15
-          port: eth0
         16:
           uid: granduc-16
-          port: eth0
         18:
           uid: granduc-18
-          port: eth0
         20:
           uid: granduc-20
-          port: eth0
         21:
           uid: granduc-21
-          port: eth0
         24:
-          uid: granduc-12
-          port: eth1
+          uid: granduc-12-eth1
         27:
-          uid: granduc-15
-          port: eth1
+          uid: granduc-15-eth1
         28:
-          uid: granduc-16
-          port: eth1
+          uid: granduc-16-eth1
         30:
-          uid: granduc-18
-          port: eth1
+          uid: granduc-18-eth1
         32:
-          uid: granduc-20
-          port: eth1
+          uid: granduc-20-eth1
         33:
-          uid: granduc-21
-          port: eth1
+          uid: granduc-21-eth1
         44:
           uid: cronos
-          port: eth0
-          kind: other
+          kind: server
         45:
 #          uid: zeus
 #          port: bmc
@@ -271,24 +244,27 @@ gw-luxembourg:
       kavlan_pattern: Ti%LINECARD%/%PORT%
       rate: 10000000000
       backplane_bps: 40000000000
-      kind: switch
+      kind: channel
       ports:
         1:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/30
-          aggregation: lacp
+          uid: Port-channel4
+          kind: channel
         2:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/32
-          aggregation: lacp
+          uid: Port-channel4
+          kind: channel
     5:
       snmp_pattern: TenGigabitEthernet%LINECARD%/%PORT%
       kavlan_pattern: Ti%LINECARD%/%PORT%
       rate: 1000000000
       backplane_bps: 40000000000
-      kind: virtual
+      kind: backbone
       ports:
         4:
           uid: renater-luxembourg
           rate: 10000000000
-          kind: virtual
+  channels:
+    Port-channel4:
+      uid: ul-grid5000-sw02
+      port: port-channel4
+      kind: switch
+      rate: 20000000000
diff --git a/input/grid5000/sites/luxembourg/networks/mxl1.yaml b/input/grid5000/sites/luxembourg/networks/mxl1.yaml
index ae36972597f..ea225808789 100644
--- a/input/grid5000/sites/luxembourg/networks/mxl1.yaml
+++ b/input/grid5000/sites/luxembourg/networks/mxl1.yaml
@@ -1,22 +1,15 @@
 ---
 mxl1:
+  role: production
   model: Force10 MXL
   kind: switch
   site: luxembourg
   snmp_community: public
   warranty: expired
-  sensors:
-    network:
-      available: true
-      resolution: 1
   backplane_bps: 1407374880000
-  weathermap:
-    use_cacti: "yes"
-  vlans:
-    "vlan101":
-      administrative: yes
-      addresses:
-        - 172.17.191.251
+  alias:
+    - m1000-mxl1
+  ip: 172.17.191.251
   linecards:
     0:
       snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
@@ -26,66 +19,49 @@ mxl1:
       ports:
         1:
           uid: petitprince-1
-          port: eth0
         2:
           uid: petitprince-2
-          port: eth0
         3:
           uid: petitprince-3
-          port: eth0
         4:
           uid: petitprince-4
-          port: eth0
         5:
           uid: petitprince-5
-          port: eth0
         6:
           uid: petitprince-6
-          port: eth0
         7:
           uid: petitprince-7
-          port: eth0
         8:
           uid: petitprince-8
-          port: eth0
         9:
           uid: petitprince-9
-          port: eth0
         10:
           uid: petitprince-10
-          port: eth0
         11:
           uid: petitprince-11
-          port: eth0
         13:
           uid: petitprince-13
-          port: eth0
         14:
           uid: petitprince-14
-          port: eth0
         15:
           uid: petitprince-15
-          port: eth0
         16:
           uid: petitprince-16
-          port: eth0
         33:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/33
-          kind: switch
-          aggregation: lacp
+          uid: Port-channel 5
+          kind: channel
         34:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/34
-          kind: switch
-          aggregation: lacp
+          uid: Port-channel 5
+          kind: channel
         35:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/35
-          kind: switch
-          aggregation: lacp
+          uid: Port-channel 5
+          kind: channel
         36:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/36
-          kind: switch
-          aggregation: lacp
+          uid: Port-channel 5
+          kind: channel
+  channels:
+    Port-channel 5:
+      uid: ul-grid5000-sw02
+      port: port-channel5
+      kind: switch
+      rate: 4000000000
diff --git a/input/grid5000/sites/luxembourg/networks/mxl2.yaml b/input/grid5000/sites/luxembourg/networks/mxl2.yaml
index 5e8c80f6b26..2831b0e8474 100644
--- a/input/grid5000/sites/luxembourg/networks/mxl2.yaml
+++ b/input/grid5000/sites/luxembourg/networks/mxl2.yaml
@@ -1,22 +1,15 @@
 ---
 mxl2:
+  role: production
   model: Force10 MXL
   kind: switch
   site: luxembourg
   snmp_community: public
   warranty: expired
-  sensors:
-    network:
-      available: true
-      resolution: 1
   backplane_bps: 1407374880000
-  weathermap:
-    use_cacti: "yes"
-  vlans:
-    "vlan101":
-      administrative: yes
-      addresses:
-        - 172.17.191.252
+  alias:
+    - m1000-mxl2
+  ip: 172.17.191.252
   linecards:
     0:
       snmp_pattern: "TenGigabitEthernet %LINECARD%/%PORT%"
@@ -25,67 +18,50 @@ mxl2:
       kind: node
       ports:
         1:
-          uid: petitprince-1
-          port: eth1
+          uid: petitprince-1-eth1
         2:
-          uid: petitprince-2
-          port: eth1
+          uid: petitprince-2-eth1
         3:
-          uid: petitprince-3
-          port: eth1
+          uid: petitprince-3-eth1
         4:
-          uid: petitprince-4
-          port: eth1
+          uid: petitprince-4-eth1
         5:
-          uid: petitprince-5
-          port: eth1
+          uid: petitprince-5-eth1
         6:
-          uid: petitprince-6
-          port: eth1
+          uid: petitprince-6-eth1
         7:
-          uid: petitprince-7
-          port: eth1
+          uid: petitprince-7-eth1
         8:
-          uid: petitprince-8
-          port: eth1
+          uid: petitprince-8-eth1
         9:
-          uid: petitprince-9
-          port: eth1
+          uid: petitprince-9-eth1
         10:
-          uid: petitprince-10
-          port: eth1
+          uid: petitprince-10-eth1
         11:
-          uid: petitprince-11
-          port: eth1
+          uid: petitprince-11-eth1
         13:
-          uid: petitprince-13
-          port: eth1
+          uid: petitprince-13-eth1
         14:
-          uid: petitprince-14
-          port: eth1
+          uid: petitprince-14-eth1
         15:
-          uid: petitprince-15
-          port: eth1
+          uid: petitprince-15-eth1
         16:
-          uid: petitprince-16
-          port: eth1
+          uid: petitprince-16-eth1
         33:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/37
-          kind: switch
-          aggregation: lacp
+          uid: Port-channel 6
+          kind: channel
         34:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/38
-          kind: switch
-          aggregation: lacp
+          uid: Port-channel 6
+          kind: channel
         35:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/39
-          kind: switch
-          aggregation: lacp
+          uid: Port-channel 6
+          kind: channel
         36:
-          uid: ul-grid5000-sw02
-          port: Ethernet1/40
-          kind: switch
-          aggregation: lacp
+          uid: Port-channel 6
+          kind: channel
+  channels:
+    Port-channel 6:
+      uid: ul-grid5000-sw02
+      port: port-channel6
+      kind: switch
+      rate: 4000000000
diff --git a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
index 04e8ba2a152..fd4f132296e 100644
--- a/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
+++ b/input/grid5000/sites/luxembourg/networks/ul-grid5000-sw02.yaml
@@ -1,125 +1,110 @@
 ---
 ul-grid5000-sw02:
+  role: production
   model: cisco N5K-C5020P-BF
   kind: switch
   site: luxembourg
   snmp_community: public
   warranty: expired
-  sensors:
-    network:
-      available: true
-      resolution: 1
   backplane_bps: 1040000000000
-  weathermap:
-    use_cacti: "yes"
-  vlans:
-    "vlan101":
-      administrative: yes
-      addresses:
-        - 172.17.191.253
+  ip: 172.17.191.253
   linecards:
 #    0:
 #      naming_pattern: "mgmt%PORT%"
 #      rate: 100000000
 #      ports:
 #        0:
-#          uid: gw-luxembourg
+#          uid: gw
 #          port: Gi1/46
 #          kind: router
     1:
-      snmp_pattern: "Ethernet%LINECARD%/%PORT%"
-      kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
+      snmp_pattern: Ethernet%LINECARD%/%PORT%
+      kavlan_pattern: Ethernet%LINECARD%/%PORT%
       rate: 10000000000
       kind: node
       ports:
         1:
         3:
-          uid: granduc-2
-          port: eth2
+          uid: granduc-2-eth2
         4:
-          uid: granduc-3
-          port: eth2
+          uid: granduc-3-eth2
         5:
-          uid: granduc-4
-          port: eth2
+          uid: granduc-4-eth2
         7:
-          uid: granduc-6
-          port: eth2
+          uid: granduc-6-eth2
         10:
-          uid: granduc-9
-          port: eth2
+          uid: granduc-9-eth2
         13:
-          uid: granduc-12
-          port: eth2
+          uid: granduc-12-eth2
         16:
-          uid: granduc-15
-          port: eth2
+          uid: granduc-15-eth2
         17:
-          uid: granduc-16
-          port: eth2
+          uid: granduc-16-eth2
         19:
-          uid: granduc-18
-          port: eth2
+          uid: granduc-18-eth2
         21:
-          uid: granduc-20
-          port: eth2
+          uid: granduc-20-eth2
         22:
-          uid: granduc-21
-          port: eth2
+          uid: granduc-21-eth2
         24:
         25:
+          uid: port-channel7
+          kind: channel
         26:
+          uid: port-channel7
+          kind: channel
         27:
         28:
         29:
         30:
-          uid: gw-luxembourg
-          port: Te3/1
-          kind: router
-          aggregation: lacp
+          uid: port-channel4
+          kind: channel
         31:
         32:
-          uid: gw-luxembourg
-          port: Te3/2
-          kind: router
-          aggregation: lacp
+          uid: port-channel4
+          kind: channel
         33:
-          uid: mxl1
-          port: Te0/33
-          kind: switch
-          aggregation: lacp
+          uid: port-channel5
+          kind: channel
         34:
-          uid: mxl1
-          port: Te0/34
-          kind: switch
-          aggregation: lacp
+          uid: port-channel5
+          kind: channel
         35:
-          uid: mxl1
-          port: Te0/35
-          kind: switch
-          aggregation: lacp
+          uid: port-channel5
+          kind: channel
         36:
-          uid: mxl1
-          port: Te0/36
-          kind: switch
-          aggregation: lacp
+          uid: port-channel5
+          kind: channel
         37:
-          uid: mxl2
-          port: Te0/33
-          kind: switch
-          aggregation: lacp
+          uid: port-channel6
+          kind: channel
         38:
-          uid: mxl2
-          port: Te0/34
-          kind: switch
-          aggregation: lacp
+          uid: port-channel6
+          kind: channel
         39:
-          uid: mxl2
-          port: Te0/35
-          kind: switch
-          aggregation: lacp
+          uid: port-channel6
+          kind: channel
         40:
-          uid: mxl2
-          port: Te0/36
-          kind: switch
-          aggregation: lacp
+          uid: port-channel6
+          kind: channel
+  channels:
+    port-channel4:
+      uid: gw
+      port: Port-channel4
+      kind: router
+      rate: 20000000000
+    port-channel5:
+      uid: mxl1
+      port: Port-channel 5
+      kind: switch
+      rate: 40000000000
+    port-channel6:
+      uid: mxl2
+      port: Port-channel 6
+      kind: switch
+      rate: 40000000000
+    port-channel7:
+      uid: srv-data
+      port: NA
+      kind: server
+      rate: 20000000000
diff --git a/input/grid5000/sites/lyon/networks/force10.yaml b/input/grid5000/sites/lyon/networks/force10.yaml
index 7b62dcc2a37..bb8fcfb19fa 100644
--- a/input/grid5000/sites/lyon/networks/force10.yaml
+++ b/input/grid5000/sites/lyon/networks/force10.yaml
@@ -1,20 +1,18 @@
 ---
 force10:
+  role: production
   model: Force10 S4810
   serial: FGSN9T1
   warranty: 2017-07-01
   kind: switch
   site: lyon
   snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-  vlans:
-    "vlan101":
-      administrative: yes
-      addresses:
-        - 172.17.63.253
+  ip: 172.17.63.253
+  alias:
+    - force10-adm
+    - staurus
+    - sorion
+    - shercule
   backplane_bps: 1280000000000
   linecards:
     0:
@@ -22,7 +20,6 @@ force10:
       kavlan_pattern: "%PORT%"
       kind: node
       rate: 10000000000
-      port: eth0
       ports:
         1: taurus-1
         2: taurus-2
@@ -44,17 +41,13 @@ force10:
         19: orion-3
         20: orion-4
         21:
-          uid: hercule-1
-          port: eth1
+          uid: hercule-1-eth1
         22:
-          uid: hercule-2
-          port: eth1
+          uid: hercule-2-eth1
         23:
-          uid: hercule-3
-          port: eth1
+          uid: hercule-3-eth1
         24:
-          uid: hercule-4
-          port: eth1
+          uid: hercule-4-eth1
         25: nova-1
         26: nova-2
         27: nova-3
@@ -80,14 +73,15 @@ force10:
         47: nova-23
         48:
           uid: castor
-          kind: other
+          kind: server
         49:
           uid: pollux
-          kind: other
+          kind: server
         50:
           uid: procyon
-          kind: other
+          kind: server
         60:
-          uid: gw-lyon
+          snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+          uid: gw
           kind: router
           port: '0:25'
diff --git a/input/grid5000/sites/lyon/networks/gw-lyon.yaml b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
index ccd0e47554c..53744c40508 100644
--- a/input/grid5000/sites/lyon/networks/gw-lyon.yaml
+++ b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
@@ -1,15 +1,17 @@
 ---
-gw-lyon:
+gw:
+  role: production
   model: Dell EMC S4128F-ON
   serial: J9J1PK2
   warranty: 2024-08-15
   kind: router
+  alias:
+    - gw-lyon
+    - router
+    - sgemini
   site: lyon
   snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
+  ip: 172.16.63.254
   vlans:
     "vlan100":
       administrative: yes
@@ -69,22 +71,18 @@ gw-lyon:
       kavlan_pattern: "%PORT%"
       kind: node
       rate: 10000000000
-      port: eth0
       ports:
         1: gemini-1
         2: gemini-2
         20:
           uid: albireo-a
-          kind: other
-          port: eno1
+          kind: server
         21:
           uid: albireo-b
-          kind: other
-          port: eno1
+          kind: server
         22:
           uid: alcor
-          kind: other
-          port: ens3f1
+          kind: server
         23:
           uid: salome
           kind: switch
@@ -95,5 +93,4 @@ gw-lyon:
           port: '0:60'
         30:
           uid: renater-lyon
-          site: renater
-          kind: virtual
+          kind: backbone
diff --git a/input/grid5000/sites/lyon/networks/salome.yaml b/input/grid5000/sites/lyon/networks/salome.yaml
index bd996b2454c..1930387c79a 100644
--- a/input/grid5000/sites/lyon/networks/salome.yaml
+++ b/input/grid5000/sites/lyon/networks/salome.yaml
@@ -1,20 +1,15 @@
 ---
 salome:
+  role: production
   model: FESX448+2XG-PREM
   serial: FL37068284
   warranty: expired
   kind: switch
   site: lyon
+  ip: 172.17.63.250
+  alias:
+    - ssagittaire
   snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-  vlans:
-    "vlan101":
-      administrative: yes
-      addresses:
-        - 172.17.63.250
   backplane_bps: 136000000000
   linecards:
     0:
@@ -25,7 +20,7 @@ salome:
       port: eth1
       ports:
         2:
-          uid: gw-lyon
+          uid: gw
           kind: router
           port: "0:23"
         4:
diff --git a/input/grid5000/sites/nancy/networks/gw-nancy.yaml b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
index ff91369f972..423f7dcf3ea 100644
--- a/input/grid5000/sites/nancy/networks/gw-nancy.yaml
+++ b/input/grid5000/sites/nancy/networks/gw-nancy.yaml
@@ -1,14 +1,16 @@
 ---
-gw-nancy:
+gw:
+  role: production
   model: Cisco Nexus 9508
   warranty: 2020-09-01
   kind: router
   site: nancy
   snmp_community: public
+  ip: 172.16.79.254
+  alias:
+    - gw-nancy
+    - sgravillon2
   sensors:
-    network:
-      available: true
-      resolution: 10
     power:
       available: true
       resolution: 1
@@ -83,175 +85,101 @@ gw-nancy:
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
       backplane_bps: 1280000000000
       model: N9K-X9464PX
-      kind: other
+      kind: node
       rate: 10000000000
       ports:
         1:
           uid: graoully-1
-          port: eth0
-          kind: node
         2:
           uid: graoully-2
-          port: eth0
-          kind: node
         3:
           uid: graoully-3
-          port: eth0
-          kind: node
         4:
           uid: graoully-4
-          port: eth0
-          kind: node
         5:
           uid: graoully-5
-          port: eth0
-          kind: node
         6:
           uid: graoully-6
-          port: eth0
-          kind: node
         7:
           uid: graoully-7
-          port: eth0
-          kind: node
         8:
           uid: graoully-8
-          port: eth0
-          kind: node
         9:
           uid: graoully-9
-          port: eth0
-          kind: node
         10:
           uid: graoully-10
-          port: eth0
-          kind: node
         11:
           uid: graoully-11
-          port: eth0
-          kind: node
         12:
           uid: graoully-12
-          port: eth0
-          kind: node
         13:
           uid: graoully-13
-          port: eth0
-          kind: node
         14:
           uid: graoully-14
-          port: eth0
-          kind: node
         15:
           uid: graoully-15
-          port: eth0
-          kind: node
         16:
           uid: graoully-16
-          port: eth0
-          kind: node
         17:
           uid: graphite-1
-          port: eth0
-          kind: node
         18:
           uid: graphite-2
-          port: eth0
-          kind: node
         19:
           uid: graphite-3
-          port: eth0
-          kind: node
         20:
           uid: graphite-4
-          port: eth0
-          kind: node
         21:
           uid: graphique-4
-          port: eth0
-          kind: node
         22:
           uid: graphique-5
-          port: eth0
-          kind: node
         23:
           uid: graphique-3
-          port: eth0
-          kind: node
         24:
           uid: graphique-2
-          port: eth0
-          kind: node
         25:
           uid: graphique-1
-          port: eth0
-          kind: node
         26:
           uid: graphique-6
-          port: eth0
-          kind: node
         27:
           uid: grisou-41
-          port: eth0
-          kind: node
         28:
           uid: grisou-42
-          port: eth0
-          kind: node
         29:
           uid: grisou-43
-          port: eth0
-          kind: node
         30:
           uid: grisou-44
-          port: eth0
-          kind: node
         31:
           uid: grisou-45
-          port: eth0
-          kind: node
         32:
           uid: grisou-46
-          port: eth0
-          kind: node
         33:
           uid: grisou-47
-          port: eth0
-          kind: node
         34:
           uid: grisou-48
-          port: eth0
-          kind: node
         35:
           uid: grisou-49
-          port: eth0
-          kind: node
         36:
           uid: grisou-50
-          port: eth0
-          kind: node
         37:
           uid: grisou-51
-          port: eth0
-          kind: node
         39:
           uid: srv
-          kind: other
+          kind: server
         40:
           uid: srv2
-          kind: other
+          kind: server
         41:
           uid: talc-data
-          kind: other
+          kind: server
         42:
           uid: srv-data
-          kind: other
+          kind: server
         47:
           uid: LORIA
-          kind: virtual
+          kind: other
         48:
           uid: renater-nancy
-          kind: virtual
+          kind: backbone
     2:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -262,196 +190,100 @@ gw-nancy:
       ports:
         1:
           uid: grisou-1
-          port: eth0
-          kind: node
         2:
           uid: grisou-2
-          port: eth0
-          kind: node
         3:
           uid: grisou-3
-          port: eth0
-          kind: node
         4:
           uid: grisou-4
-          port: eth0
-          kind: node
         5:
           uid: grisou-5
-          port: eth0
-          kind: node
         6:
           uid: grisou-6
-          port: eth0
-          kind: node
         7:
           uid: grisou-7
-          port: eth0
-          kind: node
         8:
           uid: grisou-8
-          port: eth0
-          kind: node
         9:
           uid: grisou-9
-          port: eth0
-          kind: node
         10:
           uid: grisou-10
-          port: eth0
-          kind: node
         11:
           uid: grisou-11
-          port: eth0
-          kind: node
         12:
           uid: grisou-12
-          port: eth0
-          kind: node
         13:
           uid: grisou-13
-          port: eth0
-          kind: node
         14:
           uid: grisou-14
-          port: eth0
-          kind: node
         15:
           uid: grisou-15
-          port: eth0
-          kind: node
         16:
           uid: grisou-16
-          port: eth0
-          kind: node
         17:
           uid: grisou-17
-          port: eth0
-          kind: node
         18:
           uid: grisou-18
-          port: eth0
-          kind: node
         19:
           uid: grisou-19
-          port: eth0
-          kind: node
         20:
           uid: grisou-20
-          port: eth0
-          kind: node
         21:
           uid: grisou-21
-          port: eth0
-          kind: node
         22:
           uid: grisou-22
-          port: eth0
-          kind: node
         23:
           uid: grisou-23
-          port: eth0
-          kind: node
         24:
           uid: grisou-24
-          port: eth0
-          kind: node
         25:
           uid: grisou-25
-          port: eth0
-          kind: node
         26:
           uid: grisou-26
-          port: eth0
-          kind: node
         27:
           uid: grisou-27
-          port: eth0
-          kind: node
         28:
           uid: grisou-28
-          port: eth0
-          kind: node
         29:
           uid: grisou-29
-          port: eth0
-          kind: node
         30:
           uid: grisou-30
-          port: eth0
-          kind: node
         31:
           uid: grisou-31
-          port: eth0
-          kind: node
         32:
           uid: grisou-32
-          port: eth0
-          kind: node
         33:
           uid: grisou-33
-          port: eth0
-          kind: node
         34:
           uid: grisou-34
-          port: eth0
-          kind: node
         35:
           uid: grisou-35
-          port: eth0
-          kind: node
         36:
           uid: grisou-36
-          port: eth0
-          kind: node
         37:
           uid: grisou-37
-          port: eth0
-          kind: node
         38:
           uid: grisou-38
-          port: eth0
-          kind: node
         39:
           uid: grisou-39
-          port: eth0
-          kind: node
         40:
           uid: grisou-40
-          port: eth0
-          kind: node
         41:
           uid: grimoire-1
-          port: eth0
-          kind: node
         42:
           uid: grimoire-2
-          port: eth0
-          kind: node
         43:
           uid: grimoire-3
-          port: eth0
-          kind: node
         44:
           uid: grimoire-4
-          port: eth0
-          kind: node
         45:
           uid: grimoire-5
-          port: eth0
-          kind: node
         46:
           uid: grimoire-6
-          port: eth0
-          kind: node
         47:
           uid: grimoire-7
-          port: eth0
-          kind: node
         48:
           uid: grimoire-8
-          port: eth0
-          kind: node
     3:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -461,197 +293,101 @@ gw-nancy:
       rate: 10000000000
       ports:
         1:
-          uid: grisou-1
-          kind: node
-          port: eth1
+          uid: grisou-1-eth1
         2:
-          uid: grisou-2
-          kind: node
-          port: eth1
+          uid: grisou-2-eth1
         3:
-          uid: grisou-3
-          kind: node
-          port: eth1
+          uid: grisou-3-eth1
         4:
-          uid: grisou-4
-          kind: node
-          port: eth1
+          uid: grisou-4-eth1
         5:
-          uid: grisou-5
-          kind: node
-          port: eth1
+          uid: grisou-5-eth1
         6:
-          uid: grisou-6
-          kind: node
-          port: eth1
+          uid: grisou-6-eth1
         7:
-          uid: grisou-7
-          kind: node
-          port: eth1
+          uid: grisou-7-eth1
         8:
-          uid: grisou-8
-          kind: node
-          port: eth1
+          uid: grisou-8-eth1
         9:
-          uid: grisou-9
-          kind: node
-          port: eth1
+          uid: grisou-9-eth1
         10:
-          uid: grisou-10
-          kind: node
-          port: eth1
+          uid: grisou-10-eth1
         11:
-          uid: grisou-11
-          kind: node
-          port: eth1
+          uid: grisou-11-eth1
         12:
-          uid: grisou-12
-          kind: node
-          port: eth1
+          uid: grisou-12-eth1
         13:
-          uid: grisou-13
-          kind: node
-          port: eth1
+          uid: grisou-13-eth1
         14:
-          uid: grisou-14
-          kind: node
-          port: eth1
+          uid: grisou-14-eth1
         15:
-          uid: grisou-15
-          kind: node
-          port: eth1
+          uid: grisou-15-eth1
         16:
-          uid: grisou-16
-          kind: node
-          port: eth1
+          uid: grisou-16-eth1
         17:
-          uid: grisou-17
-          kind: node
-          port: eth1
+          uid: grisou-17-eth1
         18:
-          uid: grisou-18
-          kind: node
-          port: eth1
+          uid: grisou-18-eth1
         19:
-          uid: grisou-19
-          kind: node
-          port: eth1
+          uid: grisou-19-eth1
         20:
-          uid: grisou-20
-          kind: node
-          port: eth1
+          uid: grisou-20-eth1
         21:
-          uid: grisou-21
-          kind: node
-          port: eth1
+          uid: grisou-21-eth1
         22:
-          uid: grisou-22
-          kind: node
-          port: eth1
+          uid: grisou-22-eth1
         23:
-          uid: grisou-23
-          kind: node
-          port: eth1
+          uid: grisou-23-eth1
         24:
-          uid: grisou-24
-          kind: node
-          port: eth1
+          uid: grisou-24-eth1
         25:
-          uid: grisou-25
-          kind: node
-          port: eth1
+          uid: grisou-25-eth1
         26:
-          uid: grisou-26
-          kind: node
-          port: eth1
+          uid: grisou-26-eth1
         27:
-          uid: grisou-27
-          kind: node
-          port: eth1
+          uid: grisou-27-eth1
         28:
-          uid: grisou-28
-          kind: node
-          port: eth1
+          uid: grisou-28-eth1
         29:
-          uid: grisou-29
-          kind: node
-          port: eth1
+          uid: grisou-29-eth1
         30:
-          uid: grisou-30
-          kind: node
-          port: eth1
+          uid: grisou-30-eth1
         31:
-          uid: grisou-31
-          kind: node
-          port: eth1
+          uid: grisou-31-eth1
         32:
-          uid: grisou-32
-          kind: node
-          port: eth1
+          uid: grisou-32-eth1
         33:
-          uid: grisou-33
-          kind: node
-          port: eth1
+          uid: grisou-33-eth1
         34:
-          uid: grisou-34
-          kind: node
-          port: eth1
+          uid: grisou-34-eth1
         35:
-          uid: grisou-35
-          kind: node
-          port: eth1
+          uid: grisou-35-eth1
         36:
-          uid: grisou-36
-          kind: node
-          port: eth1
+          uid: grisou-36-eth1
         37:
-          uid: grisou-37
-          kind: node
-          port: eth1
+          uid: grisou-37-eth1
         38:
-          uid: grisou-38
-          kind: node
-          port: eth1
+          uid: grisou-38-eth1
         39:
-          uid: grisou-39
-          kind: node
-          port: eth1
+          uid: grisou-39-eth1
         40:
-          uid: grisou-40
-          kind: node
-          port: eth1
+          uid: grisou-40-eth1
         41:
-          uid: grimoire-1
-          kind: node
-          port: eth1
+          uid: grimoire-1-eth1
         42:
-          uid: grimoire-2
-          kind: node
-          port: eth1
+          uid: grimoire-2-eth1
         43:
-          uid: grimoire-3
-          kind: node
-          port: eth1
+          uid: grimoire-3-eth1
         44:
-          uid: grimoire-4
-          kind: node
-          port: eth1
+          uid: grimoire-4-eth1
         45:
-          uid: grimoire-5
-          kind: node
-          port: eth1
+          uid: grimoire-5-eth1
         46:
-          uid: grimoire-6
-          kind: node
-          port: eth1
+          uid: grimoire-6-eth1
         47:
-          uid: grimoire-7
-          kind: node
-          port: eth1
+          uid: grimoire-7-eth1
         48:
-          uid: grimoire-8
-          kind: node
-          port: eth1
+          uid: grimoire-8-eth1
     4:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -661,197 +397,101 @@ gw-nancy:
       rate: 10000000000
       ports:
         1:
-          uid: grisou-1
-          kind: node
-          port: eth2
+          uid: grisou-1-eth2
         2:
-          uid: grisou-2
-          kind: node
-          port: eth2
+          uid: grisou-2-eth2
         3:
-          uid: grisou-3
-          kind: node
-          port: eth2
+          uid: grisou-3-eth2
         4:
-          uid: grisou-4
-          kind: node
-          port: eth2
+          uid: grisou-4-eth2
         5:
-          uid: grisou-5
-          kind: node
-          port: eth2
+          uid: grisou-5-eth2
         6:
-          uid: grisou-6
-          kind: node
-          port: eth2
+          uid: grisou-6-eth2
         7:
-          uid: grisou-7
-          kind: node
-          port: eth2
+          uid: grisou-7-eth2
         8:
-          uid: grisou-8
-          kind: node
-          port: eth2
+          uid: grisou-8-eth2
         9:
-          uid: grisou-9
-          kind: node
-          port: eth2
+          uid: grisou-9-eth2
         10:
-          uid: grisou-10
-          kind: node
-          port: eth2
+          uid: grisou-10-eth2
         11:
-          uid: grisou-11
-          kind: node
-          port: eth2
+          uid: grisou-11-eth2
         12:
-          uid: grisou-12
-          kind: node
-          port: eth2
+          uid: grisou-12-eth2
         13:
-          uid: grisou-13
-          kind: node
-          port: eth2
+          uid: grisou-13-eth2
         14:
-          uid: grisou-14
-          kind: node
-          port: eth2
+          uid: grisou-14-eth2
         15:
-          uid: grisou-15
-          kind: node
-          port: eth2
+          uid: grisou-15-eth2
         16:
-          uid: grisou-16
-          kind: node
-          port: eth2
+          uid: grisou-16-eth2
         17:
-          uid: grisou-17
-          kind: node
-          port: eth2
+          uid: grisou-17-eth2
         18:
-          uid: grisou-18
-          kind: node
-          port: eth2
+          uid: grisou-18-eth2
         19:
-          uid: grisou-19
-          kind: node
-          port: eth2
+          uid: grisou-19-eth2
         20:
-          uid: grisou-20
-          kind: node
-          port: eth2
+          uid: grisou-20-eth2
         21:
-          uid: grisou-21
-          kind: node
-          port: eth2
+          uid: grisou-21-eth2
         22:
-          uid: grisou-22
-          kind: node
-          port: eth2
+          uid: grisou-22-eth2
         23:
-          uid: grisou-23
-          kind: node
-          port: eth2
+          uid: grisou-23-eth2
         24:
-          uid: grisou-24
-          kind: node
-          port: eth2
+          uid: grisou-24-eth2
         25:
-          uid: grisou-25
-          kind: node
-          port: eth2
+          uid: grisou-25-eth2
         26:
-          uid: grisou-26
-          kind: node
-          port: eth2
+          uid: grisou-26-eth2
         27:
-          uid: grisou-27
-          kind: node
-          port: eth2
+          uid: grisou-27-eth2
         28:
-          uid: grisou-28
-          kind: node
-          port: eth2
+          uid: grisou-28-eth2
         29:
-          uid: grisou-29
-          kind: node
-          port: eth2
+          uid: grisou-29-eth2
         30:
-          uid: grisou-30
-          kind: node
-          port: eth2
+          uid: grisou-30-eth2
         31:
-          uid: grisou-31
-          kind: node
-          port: eth2
+          uid: grisou-31-eth2
         32:
-          uid: grisou-32
-          kind: node
-          port: eth2
+          uid: grisou-32-eth2
         33:
-          uid: grisou-33
-          kind: node
-          port: eth2
+          uid: grisou-33-eth2
         34:
-          uid: grisou-34
-          kind: node
-          port: eth2
+          uid: grisou-34-eth2
         35:
-          uid: grisou-35
-          kind: node
-          port: eth2
+          uid: grisou-35-eth2
         36:
-          uid: grisou-36
-          kind: node
-          port: eth2
+          uid: grisou-36-eth2
         37:
-          uid: grisou-37
-          kind: node
-          port: eth2
+          uid: grisou-37-eth2
         38:
-          uid: grisou-38
-          kind: node
-          port: eth2
+          uid: grisou-38-eth2
         39:
-          uid: grisou-39
-          kind: node
-          port: eth2
+          uid: grisou-39-eth2
         40:
-          uid: grisou-40
-          kind: node
-          port: eth2
+          uid: grisou-40-eth2
         41:
-          uid: grimoire-1
-          kind: node
-          port: eth2
+          uid: grimoire-1-eth2
         42:
-          uid: grimoire-2
-          kind: node
-          port: eth2
+          uid: grimoire-2-eth2
         43:
-          uid: grimoire-3
-          kind: node
-          port: eth2
+          uid: grimoire-3-eth2
         44:
-          uid: grimoire-4
-          kind: node
-          port: eth2
+          uid: grimoire-4-eth2
         45:
-          uid: grimoire-5
-          kind: node
-          port: eth2
+          uid: grimoire-5-eth2
         46:
-          uid: grimoire-6
-          kind: node
-          port: eth2
+          uid: grimoire-6-eth2
         47:
-          uid: grimoire-7
-          kind: node
-          port: eth2
+          uid: grimoire-7-eth2
         48:
-          uid: grimoire-8
-          kind: node
-          port: eth2
+          uid: grimoire-8-eth2
     5:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -861,197 +501,101 @@ gw-nancy:
       rate: 10000000000
       ports:
         1:
-          uid: grisou-1
-          kind: node
-          port: eth3
+          uid: grisou-1-eth3
         2:
-          uid: grisou-2
-          kind: node
-          port: eth3
+          uid: grisou-2-eth3
         3:
-          uid: grisou-3
-          kind: node
-          port: eth3
+          uid: grisou-3-eth3
         4:
-          uid: grisou-4
-          kind: node
-          port: eth3
+          uid: grisou-4-eth3
         5:
-          uid: grisou-5
-          kind: node
-          port: eth3
+          uid: grisou-5-eth3
         6:
-          uid: grisou-6
-          kind: node
-          port: eth3
+          uid: grisou-6-eth3
         7:
-          uid: grisou-7
-          kind: node
-          port: eth3
+          uid: grisou-7-eth3
         8:
-          uid: grisou-8
-          kind: node
-          port: eth3
+          uid: grisou-8-eth3
         9:
-          uid: grisou-9
-          kind: node
-          port: eth3
+          uid: grisou-9-eth3
         10:
-          uid: grisou-10
-          kind: node
-          port: eth3
+          uid: grisou-10-eth3
         11:
-          uid: grisou-11
-          kind: node
-          port: eth3
+          uid: grisou-11-eth3
         12:
-          uid: grisou-12
-          kind: node
-          port: eth3
+          uid: grisou-12-eth3
         13:
-          uid: grisou-13
-          kind: node
-          port: eth3
+          uid: grisou-13-eth3
         14:
-          uid: grisou-14
-          kind: node
-          port: eth3
+          uid: grisou-14-eth3
         15:
-          uid: grisou-15
-          kind: node
-          port: eth3
+          uid: grisou-15-eth3
         16:
-          uid: grisou-16
-          kind: node
-          port: eth3
+          uid: grisou-16-eth3
         17:
-          uid: grisou-17
-          kind: node
-          port: eth3
+          uid: grisou-17-eth3
         18:
-          uid: grisou-18
-          kind: node
-          port: eth3
+          uid: grisou-18-eth3
         19:
-          uid: grisou-19
-          kind: node
-          port: eth3
+          uid: grisou-19-eth3
         20:
-          uid: grisou-20
-          kind: node
-          port: eth3
+          uid: grisou-20-eth3
         21:
-          uid: grisou-21
-          kind: node
-          port: eth3
+          uid: grisou-21-eth3
         22:
-          uid: grisou-22
-          kind: node
-          port: eth3
+          uid: grisou-22-eth3
         23:
-          uid: grisou-23
-          kind: node
-          port: eth3
+          uid: grisou-23-eth3
         24:
-          uid: grisou-24
-          kind: node
-          port: eth3
+          uid: grisou-24-eth3
         25:
-          uid: grisou-25
-          kind: node
-          port: eth3
+          uid: grisou-25-eth3
         26:
-          uid: grisou-26
-          kind: node
-          port: eth3
+          uid: grisou-26-eth3
         27:
-          uid: grisou-27
-          kind: node
-          port: eth3
+          uid: grisou-27-eth3
         28:
-          uid: grisou-28
-          kind: node
-          port: eth3
+          uid: grisou-28-eth3
         29:
-          uid: grisou-29
-          kind: node
-          port: eth3
+          uid: grisou-29-eth3
         30:
-          uid: grisou-30
-          kind: node
-          port: eth3
+          uid: grisou-30-eth3
         31:
-          uid: grisou-31
-          kind: node
-          port: eth3
+          uid: grisou-31-eth3
         32:
-          uid: grisou-32
-          kind: node
-          port: eth3
+          uid: grisou-32-eth3
         33:
-          uid: grisou-33
-          kind: node
-          port: eth3
+          uid: grisou-33-eth3
         34:
-          uid: grisou-34
-          kind: node
-          port: eth3
+          uid: grisou-34-eth3
         35:
-          uid: grisou-35
-          kind: node
-          port: eth3
+          uid: grisou-35-eth3
         36:
-          uid: grisou-36
-          kind: node
-          port: eth3
+          uid: grisou-36-eth3
         37:
-          uid: grisou-37
-          kind: node
-          port: eth3
+          uid: grisou-37-eth3
         38:
-          uid: grisou-38
-          kind: node
-          port: eth3
+          uid: grisou-38-eth3
         39:
-          uid: grisou-39
-          kind: node
-          port: eth3
+          uid: grisou-39-eth3
         40:
-          uid: grisou-40
-          kind: node
-          port: eth3
+          uid: grisou-40-eth3
         41:
-          uid: grimoire-1
-          kind: node
-          port: eth3
+          uid: grimoire-1-eth3
         42:
-          uid: grimoire-2
-          kind: node
-          port: eth3
+          uid: grimoire-2-eth3
         43:
-          uid: grimoire-3
-          kind: node
-          port: eth3
+          uid: grimoire-3-eth3
         44:
-          uid: grimoire-4
-          kind: node
-          port: eth3
+          uid: grimoire-4-eth3
         45:
-          uid: grimoire-5
-          kind: node
-          port: eth3
+          uid: grimoire-5-eth3
         46:
-          uid: grimoire-6
-          kind: node
-          port: eth3
+          uid: grimoire-6-eth3
         47:
-          uid: grimoire-7
-          kind: node
-          port: eth3
+          uid: grimoire-7-eth3
         48:
-          uid: grimoire-8
-          kind: node
-          port: eth3
+          uid: grimoire-8-eth3
     6:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -1061,165 +605,85 @@ gw-nancy:
       rate: 10000000000
       ports:
         1:
-          uid: grisou-41
-          kind: node
-          port: eth1
+          uid: grisou-41-eth1
         2:
-          uid: grisou-41
-          kind: node
-          port: eth2
+          uid: grisou-41-eth2
         3:
-          uid: grisou-41
-          kind: node
-          port: eth3
+          uid: grisou-41-eth3
         4:
-          uid: grisou-42
-          kind: node
-          port: eth1
+          uid: grisou-42-eth1
         5:
-          uid: grisou-42
-          kind: node
-          port: eth2
+          uid: grisou-42-eth2
         6:
-          uid: grisou-42
-          kind: node
-          port: eth3
+          uid: grisou-42-eth3
         7:
-          uid: grisou-43
-          kind: node
-          port: eth1
+          uid: grisou-43-eth1
         8:
-          uid: grisou-43
-          kind: node
-          port: eth2
+          uid: grisou-43-eth2
         9:
-          uid: grisou-43
-          kind: node
-          port: eth3
+          uid: grisou-43-eth3
         10:
-          uid: grisou-44
-          kind: node
-          port: eth1
+          uid: grisou-44-eth1
         11:
-          uid: grisou-44
-          kind: node
-          port: eth2
+          uid: grisou-44-eth2
         12:
-          uid: grisou-44
-          kind: node
-          port: eth3
+          uid: grisou-44-eth3
         13:
-          uid: grisou-45
-          kind: node
-          port: eth1
+          uid: grisou-45-eth1
         14:
-          uid: grisou-45
-          kind: node
-          port: eth2
+          uid: grisou-45-eth2
         15:
-          uid: grisou-45
-          kind: node
-          port: eth3
+          uid: grisou-45-eth3
         16:
-          uid: grisou-46
-          kind: node
-          port: eth1
+          uid: grisou-46-eth1
         17:
-          uid: grisou-46
-          kind: node
-          port: eth2
+          uid: grisou-46-eth2
         18:
-          uid: grisou-46
-          kind: node
-          port: eth3
+          uid: grisou-46-eth3
         19:
-          uid: grisou-47
-          kind: node
-          port: eth1
+          uid: grisou-47-eth1
         20:
-          uid: grisou-47
-          kind: node
-          port: eth2
+          uid: grisou-47-eth2
         21:
-          uid: grisou-47
-          kind: node
-          port: eth3
+          uid: grisou-47-eth3
         22:
-          uid: grisou-48
-          kind: node
-          port: eth1
+          uid: grisou-48-eth1
         23:
-          uid: grisou-48
-          kind: node
-          port: eth2
+          uid: grisou-48-eth2
         24:
-          uid: grisou-48
-          kind: node
-          port: eth3
+          uid: grisou-48-eth3
         25:
-          uid: grisou-49
-          kind: node
-          port: eth1
+          uid: grisou-49-eth1
         26:
-          uid: grisou-49
-          kind: node
-          port: eth2
+          uid: grisou-49-eth2
         27:
-          uid: grisou-49
-          kind: node
-          port: eth3
+          uid: grisou-49-eth3
         28:
-          uid: grisou-50
-          kind: node
-          port: eth1
+          uid: grisou-50-eth1
         29:
-          uid: grisou-50
-          kind: node
-          port: eth2
+          uid: grisou-50-eth2
         30:
-          uid: grisou-50
-          kind: node
-          port: eth3
+          uid: grisou-50-eth3
         31:
-          uid: grisou-51
-          kind: node
-          port: eth1
+          uid: grisou-51-eth1
         32:
-          uid: grisou-51
-          kind: node
-          port: eth2
+          uid: grisou-51-eth2
         33:
-          uid: grisou-51
-          kind: node
-          port: eth3
+          uid: grisou-51-eth3
         34:
-          uid: graffiti-8
-          kind: node
-          port: eth2
+          uid: graffiti-8-eth2
         35:
-          uid: graffiti-7
-          kind: node
-          port: eth2
+          uid: graffiti-7-eth2
         37:
-          uid: graffiti-5
-          kind: node
-          port: eth2
+          uid: graffiti-5-eth2
         36:
-          uid: graffiti-2
-          kind: node
-          port: eth2
+          uid: graffiti-2-eth2
         38:
-          uid: graffiti-6
-          kind: node
-          port: eth2
+          uid: graffiti-6-eth2
         39:
-          uid: graffiti-1
-          kind: node
-          port: eth2
+          uid: graffiti-1-eth2
         40:
-          uid: graffiti-3
-          kind: node
-          port: eth2
+          uid: graffiti-3-eth2
         41:
           uid: sgrvingt
           kind: switch
@@ -1228,22 +692,16 @@ gw-nancy:
           kind: switch
         43:
           uid: grimani-4
-          port: eth0
         44:
           uid: grimani-6
-          port: eth0
         45:
           uid: grimani-5
-          port: eth0
         46:
           uid: grimani-1
-          port: eth0
         47:
           uid: grimani-2
-          port: eth0
         48:
           uid: grimani-3
-          port: eth0
     7:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
@@ -1254,84 +712,42 @@ gw-nancy:
       ports:
         1:
           uid: grele-1
-          kind: node
-          port: eth0
         2:
           uid: grele-2
-          kind: node
-          port: eth0
         3:
           uid: grele-3
-          kind: node
-          port: eth0
         4:
           uid: grele-4
-          kind: node
-          port: eth0
         5:
           uid: grele-5
-          kind: node
-          port: eth0
         6:
           uid: grele-6
-          kind: node
-          port: eth0
         7:
           uid: grele-7
-          kind: node
-          port: eth0
-        8:
-          uid: grele-8
-          kind: node
-          port: eth0
         8:
           uid: grele-8
-          kind: node
-          port: eth0
         9:
           uid: grele-9
-          kind: node
-          port: eth0
         10:
           uid: grele-10
-          kind: node
-          port: eth0
         11:
           uid: grele-11
-          kind: node
-          port: eth0
         12:
           uid: grele-12
-          kind: node
-          port: eth0
         13:
           uid: grele-13
-          kind: node
-          port: eth0
         14:
           uid: grele-14
-          kind: node
-          port: eth0
         15:
           uid: grue-1
-          kind: node
-          port: eth0
         16:
           uid: grue-2
-          kind: node
-          port: eth0
         17:
           uid: grue-3
-          kind: node
-          port: eth0
         18:
           uid: grue-4
-          kind: node
-          port: eth0
         19:
           uid: grue-5
-          kind: node
-          port: eth0
         36:
           uid: sgros2
           kind: switch
@@ -1339,26 +755,14 @@ gw-nancy:
           uid: sgros1
           kind: switch
         41:
-          uid: graffiti-13
-          kind: node
-          port: eth2
+          uid: graffiti-13-eth2
         43:
-          uid: graffiti-11
-          kind: node
-          port: eth2
+          uid: graffiti-11-eth2
         44:
-          uid: graffiti-10
-          kind: node
-          port: eth2
+          uid: graffiti-10-eth2
         45:
-          uid: graffiti-12
-          kind: node
-          port: eth2
+          uid: graffiti-12-eth2
         46:
-          uid: graffiti-9
-          kind: node
-          port: eth2
+          uid: graffiti-9-eth2
         48:
-          uid: graffiti-4
-          kind: node
-          port: eth2
+          uid: graffiti-4-eth2
diff --git a/input/grid5000/sites/nancy/networks/net-links.yaml b/input/grid5000/sites/nancy/networks/net-links.yaml
deleted file mode 100644
index 04f8bf0e1a7..00000000000
--- a/input/grid5000/sites/nancy/networks/net-links.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-sgraoullyib:
-  network_adapters:
-    ib0:
-      ip: 172.17.79.223
-
-sgrisou1:
-  network_adapters:
-    bmc:
-      mounted: true
-      ip: 172.17.79.206
-      mac: 64:00:6A:E0:CC:A2
-
-sgrele-opf:
-  network_adapters:
-    bmc:
-      mounted: true
-      ip: 172.17.79.253
-      mac: 00:13:95:22:27:96
-
-sgros1:
-  network_adapters:
-    bmc:
-      mounted: true
-      ip: 172.17.79.208
-      mac: 20:04:0f:44:4e:a9
-
-sgros2:
-  network_adapters:
-    bmc:
-      mounted: true
-      ip: 172.17.79.209
-      mac: 20:04:0f:44:2b:a9
-
diff --git a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
index ee7ce9d7786..30e0e691909 100644
--- a/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
+++ b/input/grid5000/sites/nancy/networks/sgraoullyib.yaml
@@ -1,13 +1,12 @@
 ---
 sgraoullyib:
+  role: hpc
   model: Infiniband
   warranty: 2020-09-01
   kind: switch
   site: nancy
   snmp_community: public
   sensors:
-    network:
-      available: false
     power:
       available: true
       resolution: 1
@@ -18,9 +17,7 @@ sgraoullyib:
   monitoring:
     wattmeter: true
     metric: power
-  weathermap:
-    use_cacti: "no"
-  vlans: {}
+  ip: 172.17.79.223
   linecards:
     12:
       snmp_pattern: "%LINECARD%/%PORT%"
@@ -28,6 +25,6 @@ sgraoullyib:
       kind: switch
       rate: 20000000000
       ports:
-        42: 
+        42:
           uid: node-mapping-undocumented-for-this-ib-switch
           kind: node
diff --git a/input/grid5000/sites/nancy/networks/sgrcinq.yaml b/input/grid5000/sites/nancy/networks/sgrcinq.yaml
index 06a4dd4a9d5..f7579a59a7d 100644
--- a/input/grid5000/sites/nancy/networks/sgrcinq.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrcinq.yaml
@@ -1,29 +1,19 @@
 ---
 sgrcinq:
+  role: production
   model: Cisco WS-C2960X-48TD-L
   warranty: "2028-11-28" # see bug 9837
   kind: switch
   site: nancy
   snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-    power:
-      available: false
-  vlans:
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.17.79.230
+  ip: 172.17.79.230
   backplane_bps: 100000000000
   linecards:
     0:
-       snmp_pattern: "GigabitEthernet 1/%LINECARD%/%PORT%"
+       snmp_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
        kavlan_pattern: "Gi1/%LINECARD%/%PORT%"
        kind: node
        rate: 1000000000
-       port: eth0
        ports:
          1: grcinq-3
          2: grcinq-4
@@ -74,11 +64,10 @@ sgrcinq:
          47: grcinq-1
          48: grcinq-2
     1:
-        snmp_pattern: "TenGigabitEthernet 1/0/%PORT%"
+        snmp_pattern: "TenGigabitEthernet1/0/%PORT%"
         kavlan_pattern: "TenGigabitEthernet1/0/%PORT%"
         kind: other
         rate: 10000000000
-        port: eth0
         ports:
           1:
             uid: sgrvingt
diff --git a/input/grid5000/sites/nancy/networks/sgrele-opf.yaml b/input/grid5000/sites/nancy/networks/sgrele-opf.yaml
index 4c95a2a0e87..f4f2d5ffd24 100644
--- a/input/grid5000/sites/nancy/networks/sgrele-opf.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrele-opf.yaml
@@ -1,14 +1,13 @@
 ---
 #Information in this file can be incorrect #TODO
 sgrele-opf:
+  role: hpc
   model: Omni-Path
   warranty: 2022-06-01
   kind: switch
   site: nancy
   snmp_community: public
   sensors:
-    network:
-      available: false
     power:
       available: true
       resolution: 1
@@ -21,9 +20,7 @@ sgrele-opf:
   monitoring:
     wattmeter: true
     metric: power
-  weathermap:
-    use_cacti: "no"
-  vlans: {}
+  ip: 172.17.79.253
   linecards:
     1:
       snmp_pattern: "%LINECARD%/%PORT%"
@@ -31,11 +28,9 @@ sgrele-opf:
       kind: switch
       rate: 100000000000
       ports:
-        13: 
+        13:
           uid: grele-13-when-undead
           kind: node
-        14: 
+        14:
           uid: grele-14-when-undead
           kind: node
-
-
diff --git a/input/grid5000/sites/nancy/networks/sgrisou1.yaml b/input/grid5000/sites/nancy/networks/sgrisou1.yaml
index ec791421801..39a01fb8a12 100644
--- a/input/grid5000/sites/nancy/networks/sgrisou1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrisou1.yaml
@@ -1,5 +1,6 @@
 ---
 sgrisou1:
+  role: production
   model: Dell S3048
   warranty: 2022-06-01
   kind: switch
@@ -16,211 +17,111 @@ sgrisou1:
   monitoring:
     wattmeter: true
     metric: power
-  vlans:
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.17.79.206
+  ip: 172.17.79.206
   backplane_bps: 260000000000
   linecards:
     1:
       snmp_pattern: "GigabitEthernet %LINECARD%/%PORT%"
       kavlan_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kind: other
+      kind: node
       rate: 1000000000
       ports:
         1:
-          uid: grisou-1
-          port: eth4
-          kind: node
+          uid: grisou-1-eth4
         2:
-          uid: grisou-2
-          port: eth4
-          kind: node
+          uid: grisou-2-eth4
         3:
-          uid: grisou-3
-          port: eth4
-          kind: node
+          uid: grisou-3-eth4
         4:
-          uid: grisou-4
-          port: eth4
-          kind: node
+          uid: grisou-4-eth4
         5:
-          uid: grisou-5
-          port: eth4
-          kind: node
+          uid: grisou-5-eth4
         6:
-          uid: grisou-6
-          port: eth4
-          kind: node
+          uid: grisou-6-eth4
         7:
-          uid: grisou-7
-          port: eth4
-          kind: node
+          uid: grisou-7-eth4
         8:
-          uid: grisou-8
-          port: eth4
-          kind: node
+          uid: grisou-8-eth4
         9:
-          uid: grisou-9
-          port: eth4
-          kind: node
+          uid: grisou-9-eth4
         10:
-          uid: grisou-10
-          port: eth4
-          kind: node
+          uid: grisou-10-eth4
         11:
-          uid: grisou-11
-          port: eth4
-          kind: node
+          uid: grisou-11-eth4
         12:
-          uid: grisou-12
-          port: eth4
-          kind: node
+          uid: grisou-12-eth4
         13:
-          uid: grisou-13
-          port: eth4
-          kind: node
+          uid: grisou-13-eth4
         14:
-          uid: grisou-14
-          port: eth4
-          kind: node
+          uid: grisou-14-eth4
         15:
-          uid: grisou-15
-          port: eth4
-          kind: node
+          uid: grisou-15-eth4
         16:
-          uid: grisou-16
-          port: eth4
-          kind: node
+          uid: grisou-16-eth4
         17:
-          uid: grisou-17
-          port: eth4
-          kind: node
+          uid: grisou-17-eth4
         18:
-          uid: grisou-18
-          port: eth4
-          kind: node
+          uid: grisou-18-eth4
         19:
-          uid: grisou-19
-          port: eth4
-          kind: node
+          uid: grisou-19-eth4
         20:
-          uid: grisou-20
-          port: eth4
-          kind: node
+          uid: grisou-20-eth4
         21:
-          uid: grisou-21
-          port: eth4
-          kind: node
+          uid: grisou-21-eth4
         22:
-          uid: grisou-22
-          port: eth4
-          kind: node
+          uid: grisou-22-eth4
         23:
-          uid: grisou-23
-          port: eth4
-          kind: node
+          uid: grisou-23-eth4
         24:
-          uid: grisou-24
-          port: eth4
-          kind: node
+          uid: grisou-24-eth4
         25:
-          uid: grisou-25
-          port: eth4
-          kind: node
+          uid: grisou-25-eth4
         26:
-          uid: grisou-26
-          port: eth4
-          kind: node
+          uid: grisou-26-eth4
         27:
-          uid: grisou-27
-          port: eth4
-          kind: node
+          uid: grisou-27-eth4
         28:
-          uid: grisou-28
-          port: eth4
-          kind: node
+          uid: grisou-28-eth4
         29:
-          uid: grisou-29
-          port: eth4
-          kind: node
+          uid: grisou-29-eth4
         30:
-          uid: grisou-30
-          port: eth4
-          kind: node
+          uid: grisou-30-eth4
         31:
-          uid: grisou-31
-          port: eth4
-          kind: node
+          uid: grisou-31-eth4
         32:
-          uid: grisou-32
-          port: eth4
-          kind: node
+          uid: grisou-32-eth4
         33:
-          uid: grisou-33
-          port: eth4
-          kind: node
+          uid: grisou-33-eth4
         34:
-          uid: grisou-34
-          port: eth4
-          kind: node
+          uid: grisou-34-eth4
         35:
-          uid: grisou-35
-          port: eth4
-          kind: node
+          uid: grisou-35-eth4
         36:
-          uid: grisou-36
-          port: eth4
-          kind: node
+          uid: grisou-36-eth4
         37:
-          uid: grisou-37
-          port: eth4
-          kind: node
+          uid: grisou-37-eth4
         38:
-          uid: grisou-38
-          port: eth4
-          kind: node
+          uid: grisou-38-eth4
         39:
-          uid: grisou-39
-          port: eth4
-          kind: node
+          uid: grisou-39-eth4
         40:
-          uid: grisou-40
-          port: eth4
-          kind: node
+          uid: grisou-40-eth4
         41:
-          uid: grisou-41
-          port: eth4
-          kind: node
+          uid: grisou-41-eth4
         42:
-          uid: grisou-42
-          port: eth4
-          kind: node
+          uid: grisou-42-eth4
         43:
-          uid: grisou-43
-          port: eth4
-          kind: node
+          uid: grisou-43-eth4
         44:
-          uid: grisou-44
-          port: eth4
-          kind: node
+          uid: grisou-44-eth4
         45:
-          uid: grisou-45
-          port: eth4
-          kind: node
+          uid: grisou-45-eth4
         46:
-          uid: grisou-46
-          port: eth4
-          kind: node
+          uid: grisou-46-eth4
         47:
-          uid: grisou-47
-          port: eth4
-          kind: node
+          uid: grisou-47-eth4
         48:
-          uid: grisou-48
-          port: eth4
-          kind: node
+          uid: grisou-48-eth4
     2:
       snmp_pattern: "TenGigabitEthernet 1/%PORT%"
       kavlan_pattern: "TenGigabitEthernet1/%PORT%"
@@ -228,7 +129,5 @@ sgrisou1:
       rate: 10000000000
       ports:
         52:
-          uid: gw-nancy
+          uid: gw
           kind: router
-      
-
diff --git a/input/grid5000/sites/nancy/networks/sgros1.yaml b/input/grid5000/sites/nancy/networks/sgros1.yaml
index 93d1edaadb5..6e002711e42 100644
--- a/input/grid5000/sites/nancy/networks/sgros1.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros1.yaml
@@ -1,21 +1,12 @@
 ---
 sgros1:
+  role: production
   model: Dell Z9264F-ON
   warranty: "2026-07-11"
   kind: switch
   site: nancy
   snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-    power:
-      available: false
-  vlans:
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.17.79.208
+  ip: 172.17.79.208
   backplane_bps: 6400000000000
   linecards:
     3:
@@ -23,7 +14,6 @@ sgros1:
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-117
          2: gros-118
@@ -34,336 +24,306 @@ sgros1:
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-113
          2: gros-114
          3: gros-115
          4: gros-116
-    7:  
+    7:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-109
          2: gros-110
          3: gros-111
          4: gros-112
-    9:  
+    9:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-105
          2: gros-106
          3: gros-107
          4: gros-108
-    11:  
+    11:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-101
          2: gros-102
          3: gros-103
          4: gros-104
-    13:  
+    13:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-97
          2: gros-98
          3: gros-99
          4: gros-100
-    15:  
+    15:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-61
          2: gros-62
          3: gros-63
          4: gros-64
-    17:  
+    17:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-65
          2: gros-66
          3: gros-67
          4: gros-68
-    19:  
+    19:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-69
          2: gros-70
          3: gros-71
          4: gros-72
-    21:  
+    21:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-73
          2: gros-74
          3: gros-75
          4: gros-76
-    23:  
+    23:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-25
          2: gros-26
          3: gros-27
          4: gros-28
-    25:  
+    25:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-29
          2: gros-30
          3: gros-31
          4: gros-32
-    27:  
+    27:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-33
          2: gros-34
          3: gros-35
          4: gros-36
-    29:  
+    29:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-37
          2: gros-38
          3: gros-39
          4: gros-40
-    31:  
+    31:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-5
          2: gros-6
          3: gros-7
          4: gros-8
-    33:  
+    33:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-121
          2: gros-122
          3: gros-123
          4: gros-124
-    35:  
+    35:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-77
          2: gros-78
          3: gros-79
          4: gros-80
-    37:  
+    37:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-81
          2: gros-82
          3: gros-83
          4: gros-84
-    39:  
+    39:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-85
          2: gros-86
          3: gros-87
          4: gros-88
-    41:  
+    41:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-89
          2: gros-90
          3: gros-91
          4: gros-92
-    43:  
+    43:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-93
          2: gros-94
          3: gros-95
          4: gros-96
-    45:  
+    45:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-57
          2: gros-58
          3: gros-59
          4: gros-60
-    47:  
+    47:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-53
          2: gros-54
          3: gros-55
          4: gros-56
-    49:  
+    49:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-49
          2: gros-50
          3: gros-51
          4: gros-52
-    51:  
+    51:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-45
          2: gros-46
          3: gros-47
          4: gros-48
-    53:  
+    53:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-41
          2: gros-42
          3: gros-43
          4: gros-44
-    55:  
+    55:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-21
          2: gros-22
          3: gros-23
          4: gros-24
-    57:  
+    57:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-17
          2: gros-18
          3: gros-19
          4: gros-20
-    59:  
+    59:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-13
          2: gros-14
          3: gros-15
          4: gros-16
-    61:  
+    61:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-9
          2: gros-10
          3: gros-11
          4: gros-12
-    63:  
+    63:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth0
        ports:
          1: gros-1
          2: gros-2
          3: gros-3
-         4: gros-4   
+         4: gros-4
     65:
        snmp_pattern: "ethernet 1/1/%LINECARD%"
        kavlan_pattern: "ethernet1/1/%LINECARD%"
        rate: 10000000000
        ports:
          1:
-           uid: gw-nancy
+           uid: gw
            kind: router
diff --git a/input/grid5000/sites/nancy/networks/sgros2.yaml b/input/grid5000/sites/nancy/networks/sgros2.yaml
index 8a8a6411b7a..fda995e7a29 100644
--- a/input/grid5000/sites/nancy/networks/sgros2.yaml
+++ b/input/grid5000/sites/nancy/networks/sgros2.yaml
@@ -1,21 +1,12 @@
 ---
 sgros2:
+  role: production
   model: Dell Z9264F-ON
   warranty: "2026-07-11"
   kind: switch
   site: nancy
   snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-    power:
-      available: false
-  vlans:
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.17.79.209
+  ip: 172.17.79.209
   backplane_bps: 6400000000000
   linecards:
     3:
@@ -23,347 +14,316 @@ sgros2:
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-117
-         2: gros-118
-         3: gros-119
-         4: gros-120
+         1: gros-117-eth1
+         2: gros-118-eth1
+         3: gros-119-eth1
+         4: gros-120-eth1
     5:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-113
-         2: gros-114
-         3: gros-115
-         4: gros-116
-    7:  
+         1: gros-113-eth1
+         2: gros-114-eth1
+         3: gros-115-eth1
+         4: gros-116-eth1
+    7:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-109
-         2: gros-110
-         3: gros-111
-         4: gros-112
-    9:  
+         1: gros-109-eth1
+         2: gros-110-eth1
+         3: gros-111-eth1
+         4: gros-112-eth1
+    9:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-105
-         2: gros-106
-         3: gros-107
-         4: gros-108
-    11:  
+         1: gros-105-eth1
+         2: gros-106-eth1
+         3: gros-107-eth1
+         4: gros-108-eth1
+    11:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-101
-         2: gros-102
-         3: gros-103
-         4: gros-104
-    13:  
+         1: gros-101-eth1
+         2: gros-102-eth1
+         3: gros-103-eth1
+         4: gros-104-eth1
+    13:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-97
-         2: gros-98
-         3: gros-99
-         4: gros-100
-    15:  
+         1: gros-97-eth1
+         2: gros-98-eth1
+         3: gros-99-eth1
+         4: gros-100-eth1
+    15:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-61
-         2: gros-62
-         3: gros-63
-         4: gros-64
-    17:  
+         1: gros-61-eth1
+         2: gros-62-eth1
+         3: gros-63-eth1
+         4: gros-64-eth1
+    17:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-65
-         2: gros-66
-         3: gros-67
-         4: gros-68
-    19:  
+         1: gros-65-eth1
+         2: gros-66-eth1
+         3: gros-67-eth1
+         4: gros-68-eth1
+    19:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-69
-         2: gros-70
-         3: gros-71
-         4: gros-72
-    21:  
+         1: gros-69-eth1
+         2: gros-70-eth1
+         3: gros-71-eth1
+         4: gros-72-eth1
+    21:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-73
-         2: gros-74
-         3: gros-75
-         4: gros-76
-    23:  
+         1: gros-73-eth1
+         2: gros-74-eth1
+         3: gros-75-eth1
+         4: gros-76-eth1
+    23:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-25
-         2: gros-26
-         3: gros-27
-         4: gros-28
-    25:  
+         1: gros-25-eth1
+         2: gros-26-eth1
+         3: gros-27-eth1
+         4: gros-28-eth1
+    25:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-29
-         2: gros-30
-         3: gros-31
-         4: gros-32
-    27:  
+         1: gros-29-eth1
+         2: gros-30-eth1
+         3: gros-31-eth1
+         4: gros-32-eth1
+    27:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-33
-         2: gros-34
-         3: gros-35
-         4: gros-36
-    29:  
+         1: gros-33-eth1
+         2: gros-34-eth1
+         3: gros-35-eth1
+         4: gros-36-eth1
+    29:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-37
-         2: gros-38
-         3: gros-39
-         4: gros-40
-    31:  
+         1: gros-37-eth1
+         2: gros-38-eth1
+         3: gros-39-eth1
+         4: gros-40-eth1
+    31:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-5
-         2: gros-6
-         3: gros-7
-         4: gros-8
-    33:  
+         1: gros-5-eth1
+         2: gros-6-eth1
+         3: gros-7-eth1
+         4: gros-8-eth1
+    33:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-121
-         2: gros-122
-         3: gros-123
-         4: gros-124
-    35:  
+         1: gros-121-eth1
+         2: gros-122-eth1
+         3: gros-123-eth1
+         4: gros-124-eth1
+    35:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-77
-         2: gros-78
-         3: gros-79
-         4: gros-80
-    37:  
+         1: gros-77-eth1
+         2: gros-78-eth1
+         3: gros-79-eth1
+         4: gros-80-eth1
+    37:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-81
-         2: gros-82
-         3: gros-83
-         4: gros-84
-    39:  
+         1: gros-81-eth1
+         2: gros-82-eth1
+         3: gros-83-eth1
+         4: gros-84-eth1
+    39:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-85
-         2: gros-86
-         3: gros-87
-         4: gros-88
-    41:  
+         1: gros-85-eth1
+         2: gros-86-eth1
+         3: gros-87-eth1
+         4: gros-88-eth1
+    41:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-89
-         2: gros-90
-         3: gros-91
-         4: gros-92
-    43:  
+         1: gros-89-eth1
+         2: gros-90-eth1
+         3: gros-91-eth1
+         4: gros-92-eth1
+    43:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-93
-         2: gros-94
-         3: gros-95
-         4: gros-96
-    45:  
+         1: gros-93-eth1
+         2: gros-94-eth1
+         3: gros-95-eth1
+         4: gros-96-eth1
+    45:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-57
-         2: gros-58
-         3: gros-59
-         4: gros-60
-    47:  
+         1: gros-57-eth1
+         2: gros-58-eth1
+         3: gros-59-eth1
+         4: gros-60-eth1
+    47:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-53
-         2: gros-54
-         3: gros-55
-         4: gros-56
-    49:  
+         1: gros-53-eth1
+         2: gros-54-eth1
+         3: gros-55-eth1
+         4: gros-56-eth1
+    49:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-49
-         2: gros-50
-         3: gros-51
-         4: gros-52
-    51:  
+         1: gros-49-eth1
+         2: gros-50-eth1
+         3: gros-51-eth1
+         4: gros-52-eth1
+    51:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-45
-         2: gros-46
-         3: gros-47
-         4: gros-48
-    53:  
+         1: gros-45-eth1
+         2: gros-46-eth1
+         3: gros-47-eth1
+         4: gros-48-eth1
+    53:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-41
-         2: gros-42
-         3: gros-43
-         4: gros-44
-    55:  
+         1: gros-41-eth1
+         2: gros-42-eth1
+         3: gros-43-eth1
+         4: gros-44-eth1
+    55:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-21
-         2: gros-22
-         3: gros-23
-         4: gros-24
-    57:  
+         1: gros-21-eth1
+         2: gros-22-eth1
+         3: gros-23-eth1
+         4: gros-24-eth1
+    57:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-17
-         2: gros-18
-         3: gros-19
-         4: gros-20
-    59:  
+         1: gros-17-eth1
+         2: gros-18-eth1
+         3: gros-19-eth1
+         4: gros-20-eth1
+    59:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-13
-         2: gros-14
-         3: gros-15
-         4: gros-16
-    61:  
+         1: gros-13-eth1
+         2: gros-14-eth1
+         3: gros-15-eth1
+         4: gros-16-eth1
+    61:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-9
-         2: gros-10
-         3: gros-11
-         4: gros-12
-    63:  
+         1: gros-9-eth1
+         2: gros-10-eth1
+         3: gros-11-eth1
+         4: gros-12-eth1
+    63:
        snmp_pattern: "ethernet 1/1/%LINECARD%:%PORT%"
        kavlan_pattern: "ethernet1/1/%LINECARD%:%PORT%"
        kind: node
        rate: 25000000000
-       port: eth1
        ports:
-         1: gros-1
-         2: gros-2
-         3: gros-3
-         4: gros-4   
+         1: gros-1-eth1
+         2: gros-2-eth1
+         3: gros-3-eth1
+         4: gros-4-eth1
     66:
        snmp_pattern: "ethernet 1/1/%LINECARD%"
        kavlan_pattern: "ethernet1/1/%LINECARD%"
        rate: 10000000000
        ports:
          1:
-           uid: gw-nancy
+           uid: gw
            kind: router
diff --git a/input/grid5000/sites/nancy/networks/sgrvingt.yaml b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
index b4e520aca3c..1d87813c68a 100644
--- a/input/grid5000/sites/nancy/networks/sgrvingt.yaml
+++ b/input/grid5000/sites/nancy/networks/sgrvingt.yaml
@@ -1,21 +1,12 @@
 ---
 sgrvingt:
+  role: production
   model: Dell S4048
   warranty: "2023-03-27"
   kind: switch
   site: nancy
   snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-    power:
-      available: false
-  vlans:
-    "vlan1":
-      administrative: yes
-      addresses:
-        - 172.17.79.207
+  ip: 172.17.79.207
   backplane_bps: 1440000000000
   linecards:
     1:
@@ -23,7 +14,6 @@ sgrvingt:
        kavlan_pattern: "TenGigabitEthernet%LINECARD%/%PORT%"
        kind: node
        rate: 10000000000
-       port: eth0
        ports:
          1: grvingt-3
          2: grvingt-4
@@ -65,33 +55,32 @@ sgrvingt:
          38: grvingt-6
          39: grvingt-1
          40: grvingt-2
-         41: 
+         41:
            uid: grcinq-srv-3
-           kind: other
+           kind: server
          42:
            uid: grcinq-srv-2
-           kind: other
+           kind: server
          43:
            uid: grvingt-srv
-           kind: other
+           kind: server
          44:
            uid: wurst
-           kind: other
+           kind: server
          45:
            uid: sgrcinq
            kind: switch
          46:
            uid: grcinq-srv-1
-           kind: other
+           kind: server
          48:
-           uid: gw-nancy
+           uid: gw
            kind: router
     49:
         snmp_pattern: "TenGigabitEthernet 1/%LINECARD%/%PORT%"
         kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
         kind: node
         rate: 10000000000
-        port: eth0
         ports:
           1: grvingt-44
           2: grvingt-43
@@ -102,7 +91,6 @@ sgrvingt:
         kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
         kind: node
         rate: 10000000000
-        port: eth0
         ports:
           1: grvingt-58
           2: grvingt-57
@@ -113,7 +101,6 @@ sgrvingt:
         kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
         kind: node
         rate: 10000000000
-        port: eth0
         ports:
           1: grvingt-52
           2: grvingt-51
@@ -124,7 +111,6 @@ sgrvingt:
         kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
         kind: node
         rate: 10000000000
-        port: eth0
         ports:
           1: grvingt-50
           2: grvingt-49
@@ -135,7 +121,6 @@ sgrvingt:
         kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
         kind: node
         rate: 10000000000
-        port: eth0
         ports:
           1: grvingt-60
           2: grvingt-59
@@ -146,7 +131,6 @@ sgrvingt:
         kavlan_pattern: "TenGigabitEthernet1/%LINECARD%/%PORT%"
         kind: node
         rate: 10000000000
-        port: eth0
         ports:
           1: grvingt-42
           2: grvingt-41
diff --git a/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml b/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
index f9ae606d75f..78f9b9afe53 100644
--- a/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
+++ b/input/grid5000/sites/nantes/networks/ecotype-prod1.yaml
@@ -1,14 +1,12 @@
 ---
 ecotype-prod1:
+  role: production
   model: S4048-ON
   kind: switch
   site: nantes
+  ip: 172.16.207.252
   snmp_community: public
   warranty: 2022-06-01
-  sensors:
-    network:
-      available: true
-      resolution: 1
   backplane_bps: 1280000000000
   linecards:
     1:
@@ -16,7 +14,6 @@ ecotype-prod1:
       kavlan_pattern: "%LINECARD%/%PORT%"
       kind: node
       rate: 10000000000
-      port: eth0
       ports:
         1: ecotype-1
         2: ecotype-2
@@ -67,12 +64,18 @@ ecotype-prod1:
         47: ecotype-47
         48: ecotype-48
         49:
-          uid: gw-nantes
-          port: fortyGigE0/52
-          aggregation: lacp
-          kind: router
+          uid: Port-channel 1
+          snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+          kind: channel
+          rate: 40000000000
         50:
-          uid: gw-nantes
-          port: fortyGigE0/48
-          aggregation: lacp
-          kind: router
+          uid: Port-channel 1
+          snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+          kind: channel
+          rate: 40000000000
+  channels:
+    Port-channel 1:
+      kind: router
+      uid: gw
+      port: Port-channel 1
+      rate: 80000000000
diff --git a/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml b/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
index b67d5ac55a4..beb1749ff5c 100644
--- a/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
+++ b/input/grid5000/sites/nantes/networks/ecotype-prod2.yaml
@@ -1,14 +1,12 @@
 ---
 ecotype-prod2:
+  role: production
   model: S4048-ON
   kind: switch
   site: nantes
+  ip: 172.16.207.251
   snmp_community: public
   warranty: 2022-06-01
-  sensors:
-    network:
-      available: true
-      resolution: 1
   backplane_bps: 1280000000000
   linecards:
     1:
@@ -16,63 +14,70 @@ ecotype-prod2:
       kavlan_pattern: "%LINECARD%/%PORT%"
       kind: node
       rate: 10000000000
-      port: eth1
       ports:
-        1: ecotype-1
-        2: ecotype-2
-        3: ecotype-3
-        4: ecotype-4
-        5: ecotype-5
-        6: ecotype-6
-        8: ecotype-8
-        7: ecotype-7
-        9: ecotype-9
-        10: ecotype-10
-        11: ecotype-11
-        12: ecotype-12
-        13: ecotype-13
-        14: ecotype-14
-        15: ecotype-15
-        16: ecotype-16
-        17: ecotype-17
-        18: ecotype-18
-        19: ecotype-19
-        20: ecotype-20
-        21: ecotype-21
-        22: ecotype-22
-        23: ecotype-23
-        24: ecotype-24
-        25: ecotype-25
-        26: ecotype-26
-        27: ecotype-27
-        28: ecotype-28
-        29: ecotype-29
-        30: ecotype-30
-        31: ecotype-31
-        32: ecotype-32
-        33: ecotype-33
-        34: ecotype-34
-        35: ecotype-35
-        36: ecotype-36
-        37: ecotype-37
-        38: ecotype-38
-        39: ecotype-39
-        40: ecotype-40
-        41: ecotype-41
-        42: ecotype-42
-        43: ecotype-43
-        44: ecotype-44
-        45: ecotype-45
-        46: ecotype-46
-        47: ecotype-47
-        48: ecotype-48
+        1: ecotype-1-eth1
+        2: ecotype-2-eth1
+        3: ecotype-3-eth1
+        4: ecotype-4-eth1
+        5: ecotype-5-eth1
+        6: ecotype-6-eth1
+        8: ecotype-8-eth1
+        7: ecotype-7-eth1
+        9: ecotype-9-eth1
+        10: ecotype-10-eth1
+        11: ecotype-11-eth1
+        12: ecotype-12-eth1
+        13: ecotype-13-eth1
+        14: ecotype-14-eth1
+        15: ecotype-15-eth1
+        16: ecotype-16-eth1
+        17: ecotype-17-eth1
+        18: ecotype-18-eth1
+        19: ecotype-19-eth1
+        20: ecotype-20-eth1
+        21: ecotype-21-eth1
+        22: ecotype-22-eth1
+        23: ecotype-23-eth1
+        24: ecotype-24-eth1
+        25: ecotype-25-eth1
+        26: ecotype-26-eth1
+        27: ecotype-27-eth1
+        28: ecotype-28-eth1
+        29: ecotype-29-eth1
+        30: ecotype-30-eth1
+        31: ecotype-31-eth1
+        32: ecotype-32-eth1
+        33: ecotype-33-eth1
+        34: ecotype-34-eth1
+        35: ecotype-35-eth1
+        36: ecotype-36-eth1
+        37: ecotype-37-eth1
+        38: ecotype-38-eth1
+        39: ecotype-39-eth1
+        40: ecotype-40-eth1
+        41: ecotype-41-eth1
+        42: ecotype-42-eth1
+        43: ecotype-43-eth1
+        44: ecotype-44-eth1
+        45: ecotype-45-eth1
+        46: ecotype-46-eth1
+        47: ecotype-47-eth1
+        48: ecotype-48-eth1
         49:
-          uid: gw-nantes
-          port: fortyGigE0/60
-          aggregation: lacp
-          kind: router
+          uid: Port-channel 1
+          snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+          port: fortyGigE 0/60
+          rate: 40000000000
+          kind: channel
         50:
-          uid: gw-nantes
-          port: fortyGigE0/56
-          aggregation: lacp
-          kind: router
+          uid: Port-channel 1
+          snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+          port: fortyGigE 0/56
+          rate: 40000000000
+          kind: channel
+  channels:
+    Port-channel 1:
+      kind: router
+      rate: 80000000000
+      uid: gw
+      port: Port-channel 2
diff --git a/input/grid5000/sites/nantes/networks/gw-nantes.yaml b/input/grid5000/sites/nantes/networks/gw-nantes.yaml
index 3efb1e52343..67508953cad 100644
--- a/input/grid5000/sites/nantes/networks/gw-nantes.yaml
+++ b/input/grid5000/sites/nantes/networks/gw-nantes.yaml
@@ -1,14 +1,14 @@
 ---
-gw-nantes:
+gw:
+  role: production
   model: Force10 S4810
   kind: router
   site: nantes
+  ip: 172.16.207.254
+  alias:
+    - gw-nantes
   snmp_community: public
   warranty: 2017-10-01
-  sensors:
-    network:
-      available: true
-      resolution: 1
   vlans:
     "vlan100":
       administrative: yes
@@ -39,7 +39,7 @@ gw-nantes:
     "vlan705":
       name: kavlan-5
       addresses:
-        - 10.44.64.0/18	
+        - 10.44.64.0/18
     "vlan706":
       name: kavlan-6
       addresses:
@@ -47,11 +47,11 @@ gw-nantes:
     "vlan707":
       name: kavlan-7
       addresses:
-        - 10.44.192.0/18	
+        - 10.44.192.0/18
     "vlan708":
       name: kavlan-8
       addresses:
-        - 10.45.0.0/18	
+        - 10.45.0.0/18
     "vlan709":
       name: kavlan-9
       addresses:
@@ -67,11 +67,10 @@ gw-nantes:
       kavlan_pattern: "%PORT%"
       kind: node
       rate: 10000000000
-      port: eth0
       ports:
         0:
           uid: renater-nantes
-          kind: virtual
+          kind: backbone
         45: econome-1
         44: econome-2
         15: econome-3
@@ -95,22 +94,33 @@ gw-nantes:
         31: econome-21
         32: econome-22
         48:
-          uid: ecotype-prod1
-          port: fortyGigE0/50
-          aggregation: lacp
-          kind: switch
+          uid: Port-channel 1
+          snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+          rate: 40000000000
+          kind: channel
         52:
-          uid: ecotype-prod1
-          port: fortyGigE0/49
-          aggregation: lacp
-          kind: switch
+          uid: Port-channel 1
+          snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+          rate: 40000000000
+          kind: channel
         60:
-          uid: ecotype-prod2
-          port: fortyGigE0/49
-          aggregation: lacp
-          kind: switch
+          uid: Port-channel 2
+          snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+          rate: 40000000000
+          kind: channel
         56:
-          uid: ecotype-prod2
-          port: fortyGigE0/50
-          aggregation: lacp
-          kind: switch
+          uid: Port-channel 2
+          snmp_pattern: "fortyGigE %LINECARD%/%PORT%"
+          rate: 40000000000
+          kind: channel
+  channels:
+    Port-channel 1:
+      uid: ecotype-prod1
+      port: Port-channel 1
+      rate: 80000000000
+      kind: switch
+    Port-channel 2:
+      kind: switch
+      rate: 80000000000
+      uid: ecotype-prod2
+      port: Port-channel 1
diff --git a/input/grid5000/sites/nantes/networks/net-links.yaml b/input/grid5000/sites/nantes/networks/net-links.yaml
deleted file mode 100644
index c5fa1719ce1..00000000000
--- a/input/grid5000/sites/nantes/networks/net-links.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-gw-nantes:
-  network_adapters:
-    eth0:
-      mounted: true
-      ip: 172.16.207.254
-
-ecotype-prod1:
-  network_adapters:
-    eth0:
-      mounted: true
-      ip: 172.16.207.252
-
-ecotype-prod2:
-  network_adapters:
-    eth0:
-      mounted: true
-      ip: 172.16.207.251
diff --git a/input/grid5000/sites/rennes/networks/bigdata-sw.yaml b/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
index 4a002524df7..9a8d1827f4e 100644
--- a/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
+++ b/input/grid5000/sites/rennes/networks/bigdata-sw.yaml
@@ -1,19 +1,12 @@
 ---
 bigdata-sw:
+  role: production
   model: Force10 S4810
   warranty: 2018-10-01
   kind: switch
   site: rennes
   snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-  vlans:
-    "vlan101":
-      administrative: yes
-      addresses:
-        - 172.17.111.203
+  ip: 172.17.111.203
   backplane_bps: 1280000000000
   linecards:
     0:
@@ -21,7 +14,6 @@ bigdata-sw:
       kavlan_pattern: "%PORT%"
       kind: node
       rate: 10000000000
-      port: eth0
       ports:
         0:
           uid: c6509
@@ -29,80 +21,48 @@ bigdata-sw:
           port: "1:3"
         11:
           uid: srv-bigdata
-          kind: other
+          kind: server
         18:
           uid: ceph3
-          kind: other
+          kind: server
         19:
           uid: ceph2
-          kind: other
+          kind: server
         20:
           uid: paranoia-8
-          kind: node
-          port: eth0
         21:
           uid: paranoia-7
-          kind: node
-          port: eth0
         22:
           uid: paranoia-4
-          kind: node
-          port: eth0
         23:
           uid: paranoia-3
-          kind: node
-          port: eth0
         24:
-          uid: paranoia-4
-          kind: node
-          port: eth1
+          uid: paranoia-4-eth1
         25:
-          uid: paranoia-3
-          kind: node
-          port: eth1
+          uid: paranoia-3-eth1
         26:
-          uid: paranoia-8
-          kind: node
-          port: eth1
+          uid: paranoia-8-eth1
         27:
-          uid: paranoia-7
-          kind: node
-          port: eth1
+          uid: paranoia-7-eth1
         32:
-          uid: paranoia-6
-          kind: node
-          port: eth1
+          uid: paranoia-6-eth1
         33:
-          uid: paranoia-5
-          kind: node
-          port: eth1
+          uid: paranoia-5-eth1
         34:
-          uid: paranoia-2
-          kind: node
-          port: eth1
+          uid: paranoia-2-eth1
         35:
-          uid: paranoia-1
-          kind: node
-          port: eth1
+          uid: paranoia-1-eth1
         42:
           uid: ceph1
-          kind: other
+          kind: server
         43:
           uid: ceph0
-          kind: other
+          kind: server
         44:
           uid: paranoia-6
-          kind: node
-          port: eth0
         45:
           uid: paranoia-5
-          kind: node
-          port: eth0
         46:
           uid: paranoia-2
-          kind: node
-          port: eth0
         47:
           uid: paranoia-1
-          kind: node
-          port: eth0
diff --git a/input/grid5000/sites/rennes/networks/c6509.yaml b/input/grid5000/sites/rennes/networks/c6509.yaml
index c8e54aa2d2c..2a6f5137e2e 100644
--- a/input/grid5000/sites/rennes/networks/c6509.yaml
+++ b/input/grid5000/sites/rennes/networks/c6509.yaml
@@ -1,14 +1,12 @@
 ---
 c6509:
+  role: production
   model: Cisco WS-C6509-E
   warranty: "expired"
   kind: switch
   site: rennes
   snmp_community: privkavlan
-  sensors:
-    network:
-      available: true
-      resolution: 1
+  ip: 172.17.111.207
   backplane_bps: 720000000000
   linecards:
     1:
@@ -20,7 +18,7 @@ c6509:
       model: WS-X6704-10GE
       ports:
         2:
-          uid: gw-rennes
+          uid: gw
           kind: router
           port: Ethernet2/23
         3:
@@ -28,24 +26,22 @@ c6509:
           kind: switch
     2:
       kind: node
-      port: eth2
       snmp_pattern: Gi%LINECARD%/%PORT%
       kavlan_pattern: Gi%LINECARD%/%PORT%
       rate: 1000000000
       backplane_bps: 40000000000
       model: WS-X6748-GE-TX
       ports:
-              41: paranoia-1
-              42: paranoia-2
-              43: paranoia-3
-              44: paranoia-4
-              45: paranoia-5
-              46: paranoia-6
-              47: paranoia-7
-              48: paranoia-8
+        41: paranoia-1-eth2
+        42: paranoia-2-eth2
+        43: paranoia-3-eth2
+        44: paranoia-4-eth2
+        45: paranoia-5-eth2
+        46: paranoia-6-eth2
+        47: paranoia-7-eth2
+        48: paranoia-8-eth2
     3:
       kind: node
-      port: eth0
       snmp_pattern: Gi%LINECARD%/%PORT%
       kavlan_pattern: Gi%LINECARD%/%PORT%
       rate: 1000000000
@@ -74,28 +70,27 @@ c6509:
         21: parapide-25
     4:
       kind: node
-      port: eth1
       snmp_pattern: Gi%LINECARD%/%PORT%
       kavlan_pattern: Gi%LINECARD%/%PORT%
       rate: 1000000000
       backplane_bps: 40000000000
       model: WS-X6748-GE-TX
       ports:
-        1: parapluie-1
-        2: parapluie-2
-        3: parapluie-8
-        4: parapluie-9
-        5: parapluie-11
-        6: parapluie-12
-        7: parapluie-13
-        8: parapluie-15
-        9: parapluie-19
-        10: parapluie-20
-        11: parapluie-21
-        12: parapluie-22
-        13: parapluie-25
-        14: parapluie-28
-        15: parapluie-31
-        16: parapluie-32
-        17: parapluie-35
-        18: parapluie-38
+        1: parapluie-1-eth1
+        2: parapluie-2-eth1
+        3: parapluie-8-eth1
+        4: parapluie-9-eth1
+        5: parapluie-11-eth1
+        6: parapluie-12-eth1
+        7: parapluie-13-eth1
+        8: parapluie-15-eth1
+        9: parapluie-19-eth1
+        10: parapluie-20-eth1
+        11: parapluie-21-eth1
+        12: parapluie-22-eth1
+        13: parapluie-25-eth1
+        14: parapluie-28-eth1
+        15: parapluie-31-eth1
+        16: parapluie-32-eth1
+        17: parapluie-35-eth1
+        18: parapluie-38-eth1
diff --git a/input/grid5000/sites/rennes/networks/gw-rennes.yaml b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
index e5eac5d011f..84709625157 100644
--- a/input/grid5000/sites/rennes/networks/gw-rennes.yaml
+++ b/input/grid5000/sites/rennes/networks/gw-rennes.yaml
@@ -1,14 +1,16 @@
 ---
-gw-rennes:
+gw:
+  role: production
   model: Nexus 56128P
   warranty: 2018-04-01
   kind: router
   site: rennes
   snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 10
+  ip: 172.16.111.254
+  alias:
+    - name: parasilo-sw-1
+      ip: 172.17.111.204
+    - gw-rennes
   backplane_bps: 1440000000000
   vlans:
     "vlan100":
@@ -67,264 +69,157 @@ gw-rennes:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
       rate: 10000000000
+      kind: node
       ports:
         1:
-          uid: parasilo-1
-          kind: node
-          port: eth1
+          uid: parasilo-1-eth1
         2:
           uid: parasilo-1
-          kind: node
-          port: eth0
         3:
-          uid: parasilo-2
-          kind: node
-          port: eth1
+          uid: parasilo-2-eth1
         4:
           uid: parasilo-2
-          kind: node
-          port: eth0
         5:
-          uid: parasilo-3
-          kind: node
-          port: eth1
+          uid: parasilo-3-eth1
         6:
           uid: parasilo-3
-          kind: node
-          port: eth0
         7:
-          uid: parasilo-4
-          kind: node
-          port: eth1
+          uid: parasilo-4-eth1
         8:
           uid: parasilo-4
-          kind: node
-          port: eth0
         9:
-          uid: parasilo-5
-          kind: node
-          port: eth1
+          uid: parasilo-5-eth1
         10:
           uid: parasilo-5
-          kind: node
-          port: eth0
         11:
-          uid: parasilo-6
-          kind: node
-          port: eth1
+          uid: parasilo-6-eth1
         12:
           uid: parasilo-6
-          kind: node
-          port: eth0
         13:
-          uid: parasilo-7
-          kind: node
-          port: eth1
+          uid: parasilo-7-eth1
         14:
           uid: parasilo-7
-          kind: node
-          port: eth0
         15:
-          uid: parasilo-8
-          kind: node
-          port: eth1
+          uid: parasilo-8-eth1
         16:
           uid: parasilo-8
-          kind: node
-          port: eth0
         17:
-          uid: parasilo-9
-          kind: node
-          port: eth1
+          uid: parasilo-9-eth1
         18:
           uid: parasilo-9
-          kind: node
-          port: eth0
         19:
-          uid: parasilo-10
-          kind: node
-          port: eth1
+          uid: parasilo-10-eth1
         20:
           uid: parasilo-10
-          kind: node
-          port: eth0
         21:
-          uid: parasilo-11
-          kind: node
-          port: eth1
+          uid: parasilo-11-eth1
         22:
           uid: parasilo-11
-          kind: node
-          port: eth0
         23:
-          uid: parasilo-12
-          kind: node
-          port: eth1
+          uid: parasilo-12-eth1
         24:
           uid: parasilo-12
-          kind: node
-          port: eth0
         25:
-          uid: parasilo-13
-          kind: node
-          port: eth1
+          uid: parasilo-13-eth1
         26:
           uid: parasilo-13
-          kind: node
-          port: eth0
         27:
-          uid: parasilo-14
-          kind: node
-          port: eth1
+          uid: parasilo-14-eth1
         28:
           uid: parasilo-14
-          kind: node
-          port: eth0
         29:
-          uid: parasilo-15
-          kind: node
-          port: eth1
+          uid: parasilo-15-eth1
         30:
           uid: parasilo-15
-          kind: node
-          port: eth0
         31:
-          uid: parasilo-16
-          kind: node
-          port: eth1
+          uid: parasilo-16-eth1
         32:
           uid: parasilo-16
-          kind: node
-          port: eth0
         33:
-          uid: parasilo-17
-          kind: node
-          port: eth1
+          uid: parasilo-17-eth1
         34:
           uid: parasilo-17
-          kind: node
-          port: eth0
         35:
-          uid: parasilo-18
-          kind: node
-          port: eth1
+          uid: parasilo-18-eth1
         36:
           uid: parasilo-18
-          kind: node
-          port: eth0
         37:
-          uid: parasilo-19
-          kind: node
-          port: eth1
+          uid: parasilo-19-eth1
         38:
           uid: parasilo-19
-          kind: node
-          port: eth0
         39:
-          uid: parasilo-20
-          kind: node
-          port: eth1
+          uid: parasilo-20-eth1
         40:
           uid: parasilo-20
-          kind: node
-          port: eth0
         41:
-          uid: parasilo-21
-          kind: node
-          port: eth1
+          uid: parasilo-21-eth1
         42:
           uid: parasilo-21
-          kind: node
-          port: eth0
         43:
-          uid: parasilo-22
-          kind: node
-          port: eth1
+          uid: parasilo-22-eth1
         44:
           uid: parasilo-22
-          kind: node
-          port: eth0
         45:
-          uid: parasilo-23
-          kind: node
-          port: eth1
+          uid: parasilo-23-eth1
         46:
           uid: parasilo-23
-          kind: node
-          port: eth0
         47:
-          uid: parasilo-24
-          kind: node
-          port: eth1
+          uid: parasilo-24-eth1
         48:
           uid: parasilo-24
-          kind: node
-          port: eth0
         49:
-          uid: paravance-sw-2
+          uid: port-channel3
           rate: 40000000000
-          port: Ethernet1/51
-          kind: switch
-          aggregation: lacp
+          kind: channel
         50:
-          uid: paravance-sw-2
+          uid: port-channel3
           rate: 40000000000
-          port: Ethernet1/52
-          kind: switch
-          aggregation: lacp
+          kind: channel
         51:
-          uid: paravance-sw-1
+          uid: port-channel2
           rate: 40000000000
-          port: Ethernet1/49
-          kind: switch
-          aggregation: lacp
+          kind: channel
         52:
-          uid: paravance-sw-1
+          uid: port-channel2
           rate: 40000000000
-          port: Ethernet1/50
-          kind: switch
-          aggregation: lacp
+          kind: channel
     2:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
       rate: 10000000000
+      kind: node
       ports:
         1:
-          uid: parasilo-25
-          kind: node
-          port: eth1
+          uid: parasilo-25-eth1
         2:
           uid: parasilo-25
-          kind: node
-          port: eth0
         3:
-          uid: parasilo-26
-          kind: node
-          port: eth1
+          uid: parasilo-26-eth1
         4:
           uid: parasilo-26
-          kind: node
-          port: eth0
         5:
-          uid: parasilo-27
-          kind: node
-          port: eth1
+          uid: parasilo-27-eth1
         6:
           uid: parasilo-27
-          kind: node
-          port: eth0
         7:
-          uid: parasilo-28
-          kind: node
-          port: eth1
+          uid: parasilo-28-eth1
         8:
           uid: parasilo-28
-          kind: node
-          port: eth0
         23:
           uid: c6509
           kind: switch
           port: TenGigabitEthernet1/2
         24:
           uid: renater-rennes
-          kind: virtual
+          kind: backbone
+  channels:
+    port-channel3:
+      kind: switch
+      rate: 80000000000
+      uid: paravance-sw-2
+      port: port-channel4
+    port-channel2:
+      kind: switch
+      rate: 80000000000
+      uid: paravance-sw-1
+      port: port-channel1
diff --git a/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
index 2700cf416a8..ec241295d8e 100644
--- a/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
+++ b/input/grid5000/sites/rennes/networks/paravance-sw-1.yaml
@@ -1,323 +1,181 @@
 ---
 paravance-sw-1:
+  role: production
   model: Nexus 56128P
   warranty: 2018-04-01
   kind: switch
   site: rennes
   snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
+  ip: 172.17.111.206
   backplane_bps: 1440000000000
   linecards:
     1:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
       rate: 10000000000
+      kind: node
       ports:
         1:
-          uid: paravance-1
-          kind: node
-          port: eth1
+          uid: paravance-1-eth1
         2:
           uid: paravance-1
-          kind: node
-          port: eth0
         3:
-          uid: paravance-2
-          kind: node
-          port: eth1
+          uid: paravance-2-eth1
         4:
           uid: paravance-2
-          kind: node
-          port: eth0
         5:
-          uid: paravance-3
-          kind: node
-          port: eth1
+          uid: paravance-3-eth1
         6:
           uid: paravance-3
-          kind: node
-          port: eth0
         7:
-          uid: paravance-4
-          kind: node
-          port: eth1
+          uid: paravance-4-eth1
         8:
           uid: paravance-4
-          kind: node
-          port: eth0
         9:
-          uid: paravance-5
-          kind: node
-          port: eth1
+          uid: paravance-5-eth1
         10:
           uid: paravance-5
-          kind: node
-          port: eth0
         11:
-          uid: paravance-6
-          kind: node
-          port: eth1
+          uid: paravance-6-eth1
         12:
           uid: paravance-6
-          kind: node
-          port: eth0
         13:
-          uid: paravance-7
-          kind: node
-          port: eth1
+          uid: paravance-7-eth1
         14:
           uid: paravance-7
-          kind: node
-          port: eth0
         15:
-          uid: paravance-8
-          kind: node
-          port: eth1
+          uid: paravance-8-eth1
         16:
           uid: paravance-8
-          kind: node
-          port: eth0
         17:
-          uid: paravance-9
-          kind: node
-          port: eth1
+          uid: paravance-9-eth1
         18:
           uid: paravance-9
-          kind: node
-          port: eth0
         19:
-          uid: paravance-10
-          kind: node
-          port: eth1
+          uid: paravance-10-eth1
         20:
           uid: paravance-10
-          kind: node
-          port: eth0
         21:
-          uid: paravance-11
-          kind: node
-          port: eth1
+          uid: paravance-11-eth1
         22:
           uid: paravance-11
-          kind: node
-          port: eth0
         23:
-          uid: paravance-12
-          kind: node
-          port: eth1
+          uid: paravance-12-eth1
         24:
           uid: paravance-12
-          kind: node
-          port: eth0
         25:
-          uid: paravance-13
-          kind: node
-          port: eth1
+          uid: paravance-13-eth1
         26:
           uid: paravance-13
-          kind: node
-          port: eth0
         27:
-          uid: paravance-14
-          kind: node
-          port: eth1
+          uid: paravance-14-eth1
         28:
           uid: paravance-14
-          kind: node
-          port: eth0
         29:
-          uid: paravance-15
-          kind: node
-          port: eth1
+          uid: paravance-15-eth1
         30:
           uid: paravance-15
-          kind: node
-          port: eth0
         31:
-          uid: paravance-16
-          kind: node
-          port: eth1
+          uid: paravance-16-eth1
         32:
           uid: paravance-16
-          kind: node
-          port: eth0
         33:
-          uid: paravance-17
-          kind: node
-          port: eth1
+          uid: paravance-17-eth1
         34:
           uid: paravance-17
-          kind: node
-          port: eth0
         35:
-          uid: paravance-18
-          kind: node
-          port: eth1
+          uid: paravance-18-eth1
         36:
           uid: paravance-18
-          kind: node
-          port: eth0
         37:
-          uid: paravance-19
-          kind: node
-          port: eth1
+          uid: paravance-19-eth1
         38:
           uid: paravance-19
-          kind: node
-          port: eth0
         39:
-          uid: paravance-20
-          kind: node
-          port: eth1
+          uid: paravance-20-eth1
         40:
           uid: paravance-20
-          kind: node
-          port: eth0
         41:
-          uid: paravance-21
-          kind: node
-          port: eth1
+          uid: paravance-21-eth1
         42:
           uid: paravance-21
-          kind: node
-          port: eth0
         43:
-          uid: paravance-22
-          kind: node
-          port: eth1
+          uid: paravance-22-eth1
         44:
           uid: paravance-22
-          kind: node
-          port: eth0
         45:
-          uid: paravance-23
-          kind: node
-          port: eth1
+          uid: paravance-23-eth1
         46:
           uid: paravance-23
-          kind: node
-          port: eth0
         47:
-          uid: paravance-24
-          kind: node
-          port: eth1
+          uid: paravance-24-eth1
         48:
           uid: paravance-24
-          kind: node
-          port: eth0
         49:
-          uid: gw-rennes
+          uid: port-channel1
           rate: 40000000000
-          kind: router
-          port: Ethernet1/51
-          aggregation: lacp
+          kind: channel
         50:
-          uid: gw-rennes
+          uid: port-channel1
           rate: 40000000000
-          kind: router
-          port: Ethernet1/52
-          aggregation: lacp
+          kind: channel
     2:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
       rate: 10000000000
+      kind: node
       ports:
         1:
-          uid: paravance-25
-          kind: node
-          port: eth1
+          uid: paravance-25-eth1
         2:
           uid: paravance-25
-          kind: node
-          port: eth0
         3:
-          uid: paravance-26
-          kind: node
-          port: eth1
+          uid: paravance-26-eth1
         4:
           uid: paravance-26
-          kind: node
-          port: eth0
         5:
-          uid: paravance-27
-          kind: node
-          port: eth1
+          uid: paravance-27-eth1
         6:
           uid: paravance-27
-          kind: node
-          port: eth0
         7:
-          uid: paravance-28
-          kind: node
-          port: eth1
+          uid: paravance-28-eth1
         8:
           uid: paravance-28
-          kind: node
-          port: eth0
         9:
-          uid: paravance-29
-          kind: node
-          port: eth1
+          uid: paravance-29-eth1
         10:
           uid: paravance-29
-          kind: node
-          port: eth0
         11:
-          uid: paravance-30
-          kind: node
-          port: eth1
+          uid: paravance-30-eth1
         12:
           uid: paravance-30
-          kind: node
-          port: eth0
         13:
-          uid: paravance-31
-          kind: node
-          port: eth1
+          uid: paravance-31-eth1
         14:
           uid: paravance-31
-          kind: node
-          port: eth0
         15:
-          uid: paravance-32
-          kind: node
-          port: eth1
+          uid: paravance-32-eth1
         16:
           uid: paravance-32
-          kind: node
-          port: eth0
         17:
-          uid: paravance-33
-          kind: node
-          port: eth1
+          uid: paravance-33-eth1
         18:
           uid: paravance-33
-          kind: node
-          port: eth0
         19:
-          uid: paravance-34
-          kind: node
-          port: eth1
+          uid: paravance-34-eth1
         20:
           uid: paravance-34
-          kind: node
-          port: eth0
         21:
-          uid: paravance-35
-          kind: node
-          port: eth1
+          uid: paravance-35-eth1
         22:
           uid: paravance-35
-          kind: node
-          port: eth0
         23:
-          uid: paravance-36
-          kind: node
-          port: eth1
+          uid: paravance-36-eth1
         24:
           uid: paravance-36
-          kind: node
-          port: eth0
+  channels:
+    port-channel1:
+      uid: gw
+      port: port-channel2
+      rate: 80000000000
+      kind: router
diff --git a/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml b/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
index 86bf4819277..5789b867e8f 100644
--- a/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
+++ b/input/grid5000/sites/rennes/networks/paravance-sw-2.yaml
@@ -1,323 +1,181 @@
 ---
 paravance-sw-2:
+  role: production
   model: Nexus 56128P
   warranty: 2018-04-01
   kind: switch
   site: rennes
   snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
+  ip: 172.17.111.205
   backplane_bps: 1440000000000
   linecards:
     1:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
       rate: 10000000000
+      kind: node
       ports:
         1:
-          uid: paravance-37
-          kind: node
-          port: eth1
+          uid: paravance-37-eth1
         2:
           uid: paravance-37
-          kind: node
-          port: eth0
         3:
-          uid: paravance-38
-          kind: node
-          port: eth1
+          uid: paravance-38-eth1
         4:
           uid: paravance-38
-          kind: node
-          port: eth0
         5:
-          uid: paravance-39
-          kind: node
-          port: eth1
+          uid: paravance-39-eth1
         6:
           uid: paravance-39
-          kind: node
-          port: eth0
         7:
-          uid: paravance-40
-          kind: node
-          port: eth1
+          uid: paravance-40-eth1
         8:
           uid: paravance-40
-          kind: node
-          port: eth0
         9:
-          uid: paravance-41
-          kind: node
-          port: eth1
+          uid: paravance-41-eth1
         10:
           uid: paravance-41
-          kind: node
-          port: eth0
         11:
-          uid: paravance-42
-          kind: node
-          port: eth1
+          uid: paravance-42-eth1
         12:
           uid: paravance-42
-          kind: node
-          port: eth0
         13:
-          uid: paravance-43
-          kind: node
-          port: eth1
+          uid: paravance-43-eth1
         14:
           uid: paravance-43
-          kind: node
-          port: eth0
         15:
-          uid: paravance-44
-          kind: node
-          port: eth1
+          uid: paravance-44-eth1
         16:
           uid: paravance-44
-          kind: node
-          port: eth0
         17:
-          uid: paravance-45
-          kind: node
-          port: eth1
+          uid: paravance-45-eth1
         18:
           uid: paravance-45
-          kind: node
-          port: eth0
         19:
-          uid: paravance-46
-          kind: node
-          port: eth1
+          uid: paravance-46-eth1
         20:
           uid: paravance-46
-          kind: node
-          port: eth0
         21:
-          uid: paravance-47
-          kind: node
-          port: eth1
+          uid: paravance-47-eth1
         22:
           uid: paravance-47
-          kind: node
-          port: eth0
         23:
-          uid: paravance-48
-          kind: node
-          port: eth1
+          uid: paravance-48-eth1
         24:
           uid: paravance-48
-          kind: node
-          port: eth0
         25:
-          uid: paravance-49
-          kind: node
-          port: eth1
+          uid: paravance-49-eth1
         26:
           uid: paravance-49
-          kind: node
-          port: eth0
         27:
-          uid: paravance-50
-          kind: node
-          port: eth1
+          uid: paravance-50-eth1
         28:
           uid: paravance-50
-          kind: node
-          port: eth0
         29:
-          uid: paravance-51
-          kind: node
-          port: eth1
+          uid: paravance-51-eth1
         30:
           uid: paravance-51
-          kind: node
-          port: eth0
         31:
-          uid: paravance-52
-          kind: node
-          port: eth1
+          uid: paravance-52-eth1
         32:
           uid: paravance-52
-          kind: node
-          port: eth0
         33:
-          uid: paravance-53
-          kind: node
-          port: eth1
+          uid: paravance-53-eth1
         34:
           uid: paravance-53
-          kind: node
-          port: eth0
         35:
-          uid: paravance-54
-          kind: node
-          port: eth1
+          uid: paravance-54-eth1
         36:
           uid: paravance-54
-          kind: node
-          port: eth0
         37:
-          uid: paravance-55
-          kind: node
-          port: eth1
+          uid: paravance-55-eth1
         38:
           uid: paravance-55
-          kind: node
-          port: eth0
         39:
-          uid: paravance-56
-          kind: node
-          port: eth1
+          uid: paravance-56-eth1
         40:
           uid: paravance-56
-          kind: node
-          port: eth0
         41:
-          uid: paravance-57
-          kind: node
-          port: eth1
+          uid: paravance-57-eth1
         42:
           uid: paravance-57
-          kind: node
-          port: eth0
         43:
-          uid: paravance-58
-          kind: node
-          port: eth1
+          uid: paravance-58-eth1
         44:
           uid: paravance-58
-          kind: node
-          port: eth0
         45:
-          uid: paravance-59
-          kind: node
-          port: eth1
+          uid: paravance-59-eth1
         46:
           uid: paravance-59
-          kind: node
-          port: eth0
         47:
-          uid: paravance-60
-          kind: node
-          port: eth1
+          uid: paravance-60-eth1
         48:
           uid: paravance-60
-          kind: node
-          port: eth0
         51:
-          uid: gw-rennes
+          uid: port-channel4
           rate: 40000000000
-          kind: router
-          port: Ethernet1/49
-          aggregation: lacp
+          kind: channel
         52:
-          uid: gw-rennes
+          uid: port-channel4
           rate: 40000000000
-          kind: router
-          port: Ethernet1/50
-          aggregation: lacp
+          kind: channel
     2:
       snmp_pattern: "Ethernet%LINECARD%/%PORT%"
       kavlan_pattern: "Ethernet%LINECARD%/%PORT%"
       rate: 10000000000
+      kind: node
       ports:
         1:
-          uid: paravance-61
-          kind: node
-          port: eth1
+          uid: paravance-61-eth1
         2:
           uid: paravance-61
-          kind: node
-          port: eth0
         3:
-          uid: paravance-62
-          kind: node
-          port: eth1
+          uid: paravance-62-eth1
         4:
           uid: paravance-62
-          kind: node
-          port: eth0
         5:
-          uid: paravance-63
-          kind: node
-          port: eth1
+          uid: paravance-63-eth1
         6:
           uid: paravance-63
-          kind: node
-          port: eth0
         7:
-          uid: paravance-64
-          kind: node
-          port: eth1
+          uid: paravance-64-eth1
         8:
           uid: paravance-64
-          kind: node
-          port: eth0
         9:
-          uid: paravance-65
-          kind: node
-          port: eth1
+          uid: paravance-65-eth1
         10:
           uid: paravance-65
-          kind: node
-          port: eth0
         11:
-          uid: paravance-66
-          kind: node
-          port: eth1
+          uid: paravance-66-eth1
         12:
           uid: paravance-66
-          kind: node
-          port: eth0
         13:
-          uid: paravance-67
-          kind: node
-          port: eth1
+          uid: paravance-67-eth1
         14:
           uid: paravance-67
-          kind: node
-          port: eth0
         15:
-          uid: paravance-68
-          kind: node
-          port: eth1
+          uid: paravance-68-eth1
         16:
           uid: paravance-68
-          kind: node
-          port: eth0
         17:
-          uid: paravance-69
-          kind: node
-          port: eth1
+          uid: paravance-69-eth1
         18:
           uid: paravance-69
-          kind: node
-          port: eth0
         19:
-          uid: paravance-70
-          kind: node
-          port: eth1
+          uid: paravance-70-eth1
         20:
           uid: paravance-70
-          kind: node
-          port: eth0
         21:
-          uid: paravance-71
-          kind: node
-          port: eth1
+          uid: paravance-71-eth1
         22:
           uid: paravance-71
-          kind: node
-          port: eth0
         23:
-          uid: paravance-72
-          kind: node
-          port: eth1
+          uid: paravance-72-eth1
         24:
           uid: paravance-72
-          kind: node
-          port: eth0
+  channels:
+    port-channel4:
+      uid: gw
+      port: port-channel3
+      rate: 80000000000
+      kind: router
diff --git a/input/grid5000/sites/sophia/networks/edgeiron.yaml b/input/grid5000/sites/sophia/networks/edgeiron.yaml
deleted file mode 100644
index 53874719c69..00000000000
--- a/input/grid5000/sites/sophia/networks/edgeiron.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
----
-edgeiron:
-  model: Foundry
-  warranty: expired
-  kind: switch
-  site: sophia
-  snmp_community: public
-  sensors:
-    network:
-      available: true
-      resolution: 1
-  weathermap:
-    use_cacti: "no"
-  vlans:
-    "vlan100":
-      administrative: yes
-      addresses:
-        - 172.16.143.250
-  backplane_bps: 40000000000
-  linecards:
-    0:
-      snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kavlan_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kind: router
-      rate: 1000000000
-      ports:
-        1:
-          uid: gw-sophia
-          port: ethernet2/1
-        2:
-          uid: gw-sophia
-          port: ethernet2/2
-    1:
-      snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kavlan_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        48: 
-        47: 
-        46: 
-        45: 
-        44: 
-        43: 
-        42: 
-        41: 
-        40: 
-        39: 
-        38: 
-        37: 
-        36: 
-        35: 
-        34: 
-        33: 
-        32: 
-        31: 
-        28: 
-        27: 
-        26: 
-        25: 
-        20: 
-        17: 
-        8: 
-        13: 
-        2: 
-        7: 
-        10: 
-        9: 
-        24: 
-        23: 
-        22: 
-        11: 
-        14: 
-        16: 
-        15: 
-        12: 
-        5: 
-        1: 
-        3: 
-        19: 
-        18: 
-        21: 
-    3:
-      snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kavlan_pattern: "GigabitEthernet%LINECARD%/%PORT%"
-      kind: node
-      rate: 1000000000
-      ports:
-        13: 
-        29: 
-        1: 
-        2: 
-        12: 
-        11: 
-        10: 
-        9: 
-        8: 
-        7: 
-        6: 
-        5:
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index 385fe331b84..fdd3b1e197a 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -1,14 +1,14 @@
 ---
-gw-sophia:
+gw:
+  role: production
   model: Foundry
   warranty: expired
   kind: router
   site: sophia
   snmp_community: g5kadmin
-  sensors:
-    network:
-      available: true
-      resolution: 1
+  alias:
+    - gw-sophia
+  ip: 172.16.143.254
   vlans:
     "vlan100":
       administrative: yes
@@ -85,28 +85,15 @@ gw-sophia:
       ports:
         1:
           uid: renater5-FON
-          kind: other
+          kind: backbone
         2:
           uid: swx1nef
           kind: switch
           port: 0/5
-    2:
-      snmp_pattern: "10GigabitEthernet%LINECARD%/%PORT%"
-      kind: switch
-      backplane_bps: 20000000000
-      rate: 10000000000
-      ports:
-        1:
-          uid: edgeiron
-          port: 0/1
-        2:
-          uid: edgeiron
-          port: 0/2
     7:
       snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
       kavlan_pattern: "%LINECARD%/%PORT%"
       kind: node
-      port: eth0
       backplane_bps: 24000000000
       rate: 1000000000
       ports:
@@ -122,16 +109,13 @@ gw-sophia:
         10: suno-45
         23:
           uid: srv
-          port: eth0
-          kind: other
+          kind: server
         24:
           uid: srv-stock
-          port: eth0
-          kind: other
+          kind: server
         18:
-          uid: srv2
-          port: eth1
-          kind: other
+          uid: srv2-eth1
+          kind: server
     9:
       snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
       kavlan_pattern: "%LINECARD%/%PORT%"
@@ -141,12 +125,10 @@ gw-sophia:
       ports:
         10:
           uid: stock
-          kind: other
-          port: eth0
+          kind: server
         12:
-          uid: stock
-          kind: other
-          port: eth1
+          uid: stock-eth1
+          kind: server
     5:
       snmp_pattern: "GigabitEthernet%LINECARD%/%PORT%"
       kavlan_pattern: "%LINECARD%/%PORT%"
@@ -199,26 +181,20 @@ gw-sophia:
         17: suno-34
         18: suno-35
         19:
-          uid: srv-stock
-          port: eth2
-          kind: other
+          uid: srv-stock-eth2
+          kind: server
         20:
-          uid: srv
-          port: eth1
-          kind: other
+          uid: srv-eth1
+          kind: server
         21:
-          uid: srv
-          port: eth3
-          kind: other
+          uid: srv-eth3
+          kind: server
         22:
-          uid: srv
-          port: eth2
-          kind: other
+          uid: srv-eth2
+          kind: server
         23:
-          uid: srv-stock
-          port: eth3
-          kind: other
+          uid: srv-stock-eth3
+          kind: server
         24:
-          uid: srv-stock
-          port: eth1
-          kind: other
+          uid: srv-stock-eth1
+          kind: server
diff --git a/input/grid5000/sites/sophia/networks/swx1nef.yaml b/input/grid5000/sites/sophia/networks/swx1nef.yaml
index b8c02b250ae..98c0cfa2e04 100644
--- a/input/grid5000/sites/sophia/networks/swx1nef.yaml
+++ b/input/grid5000/sites/sophia/networks/swx1nef.yaml
@@ -1,5 +1,6 @@
 ---
 swx1nef:
+  role: production
   model: Juniper EX2500-24F-FB
   warranty: expired
   kind: switch
@@ -13,7 +14,7 @@ swx1nef:
       rate: 10000000000
       ports:
         5:
-          uid: gw-sophia
+          uid: gw
           kind: router
           port: 1/2
         18:
diff --git a/input/grid5000/sites/sophia/networks/swy1nef.yaml b/input/grid5000/sites/sophia/networks/swy1nef.yaml
index 65eae1faec8..d0b37cd7624 100644
--- a/input/grid5000/sites/sophia/networks/swy1nef.yaml
+++ b/input/grid5000/sites/sophia/networks/swy1nef.yaml
@@ -1,17 +1,18 @@
 ---
 swy1nef:
+  role: production
   model: Dell PowerConnect 6248
   warranty: expired
   kind: switch
   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
-      port: eth0
       rate: 1000000000
       ports:
         53: uvb-27
@@ -34,7 +35,7 @@ swy1nef:
         71: uvb-15
         72:
           uid: opensm
-          kind: other
+          kind: server
         73: uvb-19
         74: uvb-14
         75: uvb-17
-- 
GitLab