diff --git a/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json b/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
index 4caa31b18fc99b4733cfd5c593f8731861af526e..44f7b0ef3c9547acddcf453aabebaea36da347c4 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw-grenoble.json
@@ -6,10 +6,8 @@
   "kind": "router",
   "linecards": [
     {
-
     },
     {
-
     },
     {
       "backplane_bps": 48000000000,
@@ -17,7 +15,6 @@
       "naming_pattern": "%LINECARD%:%PORT%",
       "ports": [
         {
-
         },
         {
           "port": "0/1",
@@ -68,34 +65,24 @@
           "uid": "sw-edel-4"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "uid": "voltaire-1"
@@ -113,7 +100,6 @@
       "naming_pattern": "%LINECARD%:%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "other",
@@ -152,10 +138,8 @@
           "uid": "grimage-10"
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth0",
@@ -202,13 +186,10 @@
           "uid": "voltaire-3"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth1",
@@ -251,10 +232,8 @@
           "uid": "genepi-32"
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth1",
@@ -290,14 +269,12 @@
       "naming_pattern": "%LINECARD%:%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "switch",
           "uid": "summit-grimage"
         },
         {
-
         },
         {
           "port": "eth1",
@@ -332,10 +309,8 @@
           "uid": "genepi-21"
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth1",
@@ -423,19 +398,14 @@
       "snmp_pattern": "BD-8810 Port %LINECARD%:%PORT%"
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
       "backplane_bps": 48000000000,
@@ -443,7 +413,6 @@
       "naming_pattern": "%LINECARD%:%PORT%",
       "ports": [
         {
-
         },
         {
           "port": "eth2",
@@ -451,7 +420,6 @@
           "uid": "dignfs"
         },
         {
-
         },
         {
           "kind": "virtual",
@@ -466,7 +434,6 @@
   "model": "ExtremeNetworks",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "grenoble",
   "snmp_community": "public",
@@ -552,6 +519,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/network_equipments/ib-grenoble.json b/data/grid5000/sites/grenoble/network_equipments/ib-grenoble.json
index 430b59cc0b9324c7cc9669aca365d909a6f99577..b41dc85a42dc46f6807bcc5eb73ef77972639f4a 100644
--- a/data/grid5000/sites/grenoble/network_equipments/ib-grenoble.json
+++ b/data/grid5000/sites/grenoble/network_equipments/ib-grenoble.json
@@ -1,5 +1,4 @@
 {
-  "backplane_bps": null,
   "channels": {
     "naming_pattern": "Po%CHANNELID%"
   },
@@ -23,9 +22,7 @@
     }
   ],
   "model": "Infiniband",
-  "mtu": null,
   "routes": {
-
   },
   "site": "grenoble",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-edel-1.json b/data/grid5000/sites/grenoble/network_equipments/sw-edel-1.json
index a6837e08d177f9299505c52dcc2cc6e4521098ad..f6acfec1a2a3d5118d70a0e0ed6c9bde7885d708 100644
--- a/data/grid5000/sites/grenoble/network_equipments/sw-edel-1.json
+++ b/data/grid5000/sites/grenoble/network_equipments/sw-edel-1.json
@@ -1,28 +1,22 @@
 {
-  "backplane_bps": null,
   "channels": {
     "naming_pattern": "Po%CHANNELID%"
   },
   "kind": "switch",
   "linecards": [
     {
-
     },
     {
       "kind": "node",
       "naming_pattern": "%LINECARD%/0/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -83,10 +77,8 @@
           "uid": "edel-18"
         },
         {
-
         },
         {
-
         },
         {
           "kind": "router",
@@ -111,7 +103,6 @@
   "model": "Broadcom",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "grenoble",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-edel-2.json b/data/grid5000/sites/grenoble/network_equipments/sw-edel-2.json
index 4db14949c0c38b1eff9d8b46ed4e4c6f38e7f3ab..a6aecc0460854fc33bc418c10e8f463149201787 100644
--- a/data/grid5000/sites/grenoble/network_equipments/sw-edel-2.json
+++ b/data/grid5000/sites/grenoble/network_equipments/sw-edel-2.json
@@ -1,28 +1,22 @@
 {
-  "backplane_bps": null,
   "channels": {
     "naming_pattern": "Po%CHANNELID%"
   },
   "kind": "switch",
   "linecards": [
     {
-
     },
     {
       "kind": "node",
       "naming_pattern": "%LINECARD%/0/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -83,10 +77,8 @@
           "uid": "edel-36"
         },
         {
-
         },
         {
-
         },
         {
           "kind": "router",
@@ -111,7 +103,6 @@
   "model": "Broadcom",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "grenoble",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-edel-3.json b/data/grid5000/sites/grenoble/network_equipments/sw-edel-3.json
index 4df8b061369fae5446e1d776d70a50aca0c1a221..cefb430c5419c8a3d67c3961139274ace9497739 100644
--- a/data/grid5000/sites/grenoble/network_equipments/sw-edel-3.json
+++ b/data/grid5000/sites/grenoble/network_equipments/sw-edel-3.json
@@ -1,28 +1,22 @@
 {
-  "backplane_bps": null,
   "channels": {
     "naming_pattern": "Po%CHANNELID%"
   },
   "kind": "switch",
   "linecards": [
     {
-
     },
     {
       "kind": "node",
       "naming_pattern": "%LINECARD%/0/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -83,10 +77,8 @@
           "uid": "edel-54"
         },
         {
-
         },
         {
-
         },
         {
           "kind": "router",
@@ -111,7 +103,6 @@
   "model": "Broadcom",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "grenoble",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-edel-4.json b/data/grid5000/sites/grenoble/network_equipments/sw-edel-4.json
index 36557203e4e2c0a831ad3b72d2a2c7872786eeef..0b5d512db1e447fe01af5fc3f556a2edf72f5550 100644
--- a/data/grid5000/sites/grenoble/network_equipments/sw-edel-4.json
+++ b/data/grid5000/sites/grenoble/network_equipments/sw-edel-4.json
@@ -1,28 +1,22 @@
 {
-  "backplane_bps": null,
   "channels": {
     "naming_pattern": "Po%CHANNELID%"
   },
   "kind": "switch",
   "linecards": [
     {
-
     },
     {
       "kind": "node",
       "naming_pattern": "%LINECARD%/0/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -83,10 +77,8 @@
           "uid": "edel-72"
         },
         {
-
         },
         {
-
         },
         {
           "kind": "router",
@@ -111,7 +103,6 @@
   "model": "Broadcom",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "grenoble",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/grenoble/network_equipments/voltaire-1.json b/data/grid5000/sites/grenoble/network_equipments/voltaire-1.json
index 01afdd72c77e05c4c7138183f888ff1b99e62227..74a6c8caee8656cb25b585308a6cb0576bb27289 100644
--- a/data/grid5000/sites/grenoble/network_equipments/voltaire-1.json
+++ b/data/grid5000/sites/grenoble/network_equipments/voltaire-1.json
@@ -1,5 +1,4 @@
 {
-  "backplane_bps": null,
   "channels": {
     "naming_pattern": "Po%CHANNELID%"
   },
@@ -17,9 +16,7 @@
     }
   ],
   "model": "Infiniband",
-  "mtu": null,
   "routes": {
-
   },
   "site": "grenoble",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/grenoble/network_equipments/voltaire-2.json b/data/grid5000/sites/grenoble/network_equipments/voltaire-2.json
index 4d4f940fb078ec92fa903fcc37fa30ed95500b1e..01d8bca289d00aace246e3b77bc1a2793cf00532 100644
--- a/data/grid5000/sites/grenoble/network_equipments/voltaire-2.json
+++ b/data/grid5000/sites/grenoble/network_equipments/voltaire-2.json
@@ -1,5 +1,4 @@
 {
-  "backplane_bps": null,
   "channels": {
     "naming_pattern": "Po%CHANNELID%"
   },
@@ -17,9 +16,7 @@
     }
   ],
   "model": "Infiniband",
-  "mtu": null,
   "routes": {
-
   },
   "site": "grenoble",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/grenoble/network_equipments/voltaire-3.json b/data/grid5000/sites/grenoble/network_equipments/voltaire-3.json
index 9fede8063044550876d03e926d740fe86692da57..df2a05671f35d71f5a9c9e9c2ee56bffa219e2ab 100644
--- a/data/grid5000/sites/grenoble/network_equipments/voltaire-3.json
+++ b/data/grid5000/sites/grenoble/network_equipments/voltaire-3.json
@@ -1,5 +1,4 @@
 {
-  "backplane_bps": null,
   "channels": {
     "naming_pattern": "Po%CHANNELID%"
   },
@@ -17,9 +16,7 @@
     }
   ],
   "model": "Infiniband",
-  "mtu": null,
   "routes": {
-
   },
   "site": "grenoble",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json b/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json
index 2a9c9bc28f9f6ca22f624c919b34d9eb4bc8a3f1..a00a1b9f3398fa4f12273a215b4820c18e865312 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json
@@ -47,7 +47,6 @@
   "kind": "router",
   "linecards": [
     {
-
     },
     {
       "backplane_bps": 40000000000,
@@ -55,73 +54,50 @@
       "naming_pattern": "Gi%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -188,10 +164,8 @@
           "uid": "cronos"
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -199,28 +173,20 @@
           "uid": "zeus"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         }
       ],
       "rate": 1000000000,
@@ -232,7 +198,6 @@
       "naming_pattern": "Gi%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "port": "eth0",
@@ -323,7 +288,6 @@
           "uid": "granduc-22"
         },
         {
-
         },
         {
           "port": "eth1",
@@ -370,31 +334,22 @@
           "uid": "granduc-22"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -402,7 +357,6 @@
           "uid": "cronos"
         },
         {
-
         },
         {
           "kind": "other",
@@ -410,10 +364,8 @@
           "uid": "hera"
         },
         {
-
         },
         {
-
         }
       ],
       "rate": 1000000000,
@@ -425,7 +377,6 @@
       "naming_pattern": "Te%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "port": "Ethernet1/30",
@@ -440,7 +391,6 @@
       "snmp_pattern": "TenGigabitEthernet%LINECARD%/%PORT%"
     },
     {
-
     },
     {
       "backplane_bps": 40000000000,
@@ -448,16 +398,12 @@
       "naming_pattern": "Te%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "rate": 10000000000,
@@ -471,7 +417,6 @@
   "model": "cisco WS-C6506-E",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "luxembourg",
   "snmp_community": "public",
@@ -567,6 +512,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ 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 91e89734f580fa4e0c4b776bd8e544faba1679f6..3d786cc14e49ca884580477327d24b98f7db92ee 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/mxl1.json
@@ -29,7 +29,6 @@
       "naming_pattern": "Te%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "port": "eth0",
@@ -96,52 +95,36 @@
           "uid": "petitprince-16"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "switch",
@@ -171,7 +154,6 @@
   "model": "Force10 MXL",
   "mtu": 1554,
   "routes": {
-
   },
   "site": "luxembourg",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/luxembourg/network_equipments/mxl2.json b/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
index 4a935f6e26f7a0419ced79449caf86852179e08a..0403c563eef8f96aa34e8845e9a4861d023bd5fd 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/mxl2.json
@@ -29,7 +29,6 @@
       "naming_pattern": "Te%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "port": "eth1",
@@ -96,52 +95,36 @@
           "uid": "petitprince-16"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "switch",
@@ -171,7 +154,6 @@
   "model": "Force10 MXL",
   "mtu": 1554,
   "routes": {
-
   },
   "site": "luxembourg",
   "snmp_community": "public",
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 9de4b6023d84c17c3c96b01b8d08143c46bd2e41..8b6f9d40c95cdd0195aa1735891e053cd3233cb3 100644
--- a/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
+++ b/data/grid5000/sites/luxembourg/network_equipments/ul-grid5000-sw02.json
@@ -43,17 +43,14 @@
   "kind": "switch",
   "linecards": [
     {
-
     },
     {
       "kind": "node",
       "naming_pattern": "Ethernet%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
           "port": "eth2",
@@ -144,22 +141,16 @@
           "uid": "granduc-22"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "router",
@@ -167,7 +158,6 @@
           "uid": "gw-luxembourg"
         },
         {
-
         },
         {
           "kind": "router",
@@ -222,7 +212,6 @@
   "model": "cisco N5K-C5020P-BF",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "luxembourg",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/lyon/network_equipments/force10.json b/data/grid5000/sites/lyon/network_equipments/force10.json
index db7dc23f3eecdac30c9f9c81892aec7f1d15acd6..8991e10c104b5b5417d544371bc393bc7e380ed9 100644
--- a/data/grid5000/sites/lyon/network_equipments/force10.json
+++ b/data/grid5000/sites/lyon/network_equipments/force10.json
@@ -11,7 +11,6 @@
       "port": "eth0",
       "ports": [
         {
-
         },
         {
           "uid": "taurus-1"
@@ -62,7 +61,6 @@
           "uid": "taurus-16"
         },
         {
-
         },
         {
           "uid": "orion-1"
@@ -77,10 +75,8 @@
           "uid": "orion-4"
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth1",
@@ -99,28 +95,20 @@
           "uid": "hercule-4"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -131,16 +119,12 @@
           "uid": "pollux"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "router",
@@ -148,16 +132,12 @@
           "uid": "gw-lyon"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "switch",
@@ -172,7 +152,6 @@
   "model": "Force10 S4810",
   "mtu": 12000,
   "routes": {
-
   },
   "site": "lyon",
   "snmp_community": "public",
@@ -188,6 +167,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ 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-lyon.json
index bf9c88de15c3803c3bd86241d423fb5d37642b3d..a791ac0b8035a229dc416e987bd43c79548ab8d8 100644
--- a/data/grid5000/sites/lyon/network_equipments/gw-lyon.json
+++ b/data/grid5000/sites/lyon/network_equipments/gw-lyon.json
@@ -6,10 +6,8 @@
   "kind": "router",
   "linecards": [
     {
-
     },
     {
-
     },
     {
       "backplane_bps": 48000000000,
@@ -18,7 +16,6 @@
       "port": "eth1",
       "ports": [
         {
-
         },
         {
           "uid": "sagittaire-49"
@@ -60,7 +57,6 @@
           "uid": "sagittaire-61"
         },
         {
-
         },
         {
           "uid": "sagittaire-63"
@@ -84,7 +80,6 @@
           "uid": "sagittaire-69"
         },
         {
-
         },
         {
           "uid": "sagittaire-71"
@@ -114,10 +109,8 @@
           "uid": "sagittaire-79"
         },
         {
-
         },
         {
-
         },
         {
           "uid": "cyrrus-adm"
@@ -133,7 +126,6 @@
       "port": "eth1",
       "ports": [
         {
-
         },
         {
           "uid": "sagittaire-1"
@@ -253,7 +245,6 @@
           "uid": "sagittaire-39"
         },
         {
-
         },
         {
           "uid": "sagittaire-41"
@@ -289,22 +280,16 @@
       "naming_pattern": "%LINECARD%:%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -317,43 +302,30 @@
           "uid": "flow"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -361,46 +333,32 @@
           "uid": "nebula"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -408,37 +366,26 @@
           "uid": "wattmetre"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "virtual",
@@ -449,16 +396,12 @@
       "snmp_pattern": "BD-8810 Port %LINECARD%:%PORT%"
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
       "backplane_bps": 48000000000,
@@ -466,10 +409,8 @@
       "naming_pattern": "%LINECARD%:%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
           "port": "0:42",
@@ -492,7 +433,6 @@
   "model": "Extreme Networks version 12.1.3.14",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "lyon",
   "snmp_community": "public",
@@ -578,6 +518,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/network_equipments/pat.json b/data/grid5000/sites/lyon/network_equipments/pat.json
index a22afa8438051a524d52905c785317ea8ea857ab..2116c27821109e2cd6200649b7a81816c8af4ad8 100644
--- a/data/grid5000/sites/lyon/network_equipments/pat.json
+++ b/data/grid5000/sites/lyon/network_equipments/pat.json
@@ -6,14 +6,12 @@
   "kind": "switch",
   "linecards": [
     {
-
     },
     {
       "kind": "node",
       "naming_pattern": "%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "port": "eth2",
@@ -32,52 +30,36 @@
           "uid": "hercule-4"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth3",
@@ -113,7 +95,6 @@
   "model": "Foundry EdgeIron",
   "mtu": 1500,
   "routes": {
-
   },
   "site": "lyon",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/lyon/network_equipments/salome.json b/data/grid5000/sites/lyon/network_equipments/salome.json
index f47b64f8fd1ad1514020c4d0aba4dff9bfa6ac51..2fdd2d14dd1e8b63111d49d21a2b6e1f78705f85 100644
--- a/data/grid5000/sites/lyon/network_equipments/salome.json
+++ b/data/grid5000/sites/lyon/network_equipments/salome.json
@@ -10,148 +10,100 @@
       "naming_pattern": "ethernet%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -171,7 +123,6 @@
   "model": "Foundry FES-X 448",
   "mtu": 10240,
   "routes": {
-
   },
   "site": "lyon",
   "snmp_community": "public",
@@ -187,6 +138,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
index 7ba2a0bacf0e34ff400ca3c25e249ad6a0c78ad3..3fcdfee5442a2222fa966f5bc4d40ac91dc6065e 100644
--- a/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
+++ b/data/grid5000/sites/nancy/network_equipments/gw-nancy.json
@@ -1,10 +1,8 @@
 {
   "backplane_bps": 1280000000000,
-  "channels": null,
   "kind": "router",
   "linecards": [
     {
-
     },
     {
       "backplane_bps": 1280000000000,
@@ -13,7 +11,6 @@
       "naming_pattern": "E%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "node",
@@ -96,22 +93,16 @@
           "uid": "graphite-4"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "node",
@@ -158,24 +149,20 @@
           "uid": "grisou-51"
         },
         {
-
         },
         {
           "kind": "other",
           "uid": "grigri"
         },
         {
-
         },
         {
           "kind": "other",
           "uid": "talc-data"
         },
         {
-
         },
         {
-
         },
         {
           "kind": "switch",
@@ -190,7 +177,6 @@
           "uid": "sgravillon1"
         },
         {
-
         },
         {
           "kind": "virtual",
@@ -207,7 +193,6 @@
       "naming_pattern": "E%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "node",
@@ -412,7 +397,6 @@
       "naming_pattern": "E%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "node",
@@ -665,7 +649,6 @@
       "naming_pattern": "E%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "node",
@@ -918,7 +901,6 @@
       "naming_pattern": "E%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "node",
@@ -1168,7 +1150,6 @@
   "model": "Cisco Nexus 9508",
   "mtu": 9220,
   "routes": {
-
   },
   "site": "nancy",
   "snmp_community": "public",
@@ -1254,6 +1235,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ 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 ac91a2f9271628ea420e7e8956fb58f8db7dddbc..aafa5aa69276101a72a8153f5198d68dd89f39d8 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
@@ -1,85 +1,60 @@
 {
-  "backplane_bps": null,
   "channels": {
     "naming_pattern": "Po%CHANNELID%"
   },
   "kind": "switch",
   "linecards": [
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
       "kind": "switch",
       "naming_pattern": "%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "switch",
@@ -91,9 +66,7 @@
     }
   ],
   "model": "Infiniband",
-  "mtu": null,
   "routes": {
-
   },
   "site": "nancy",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene1.json b/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
index 759ac448625076d43971f8e407109b45aacc5ee7..217fda5b2e68cf4693f54a8f2742f6670614d3a2 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene1.json
@@ -10,7 +10,6 @@
       "naming_pattern": "GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "graphene-2"
@@ -127,7 +126,6 @@
           "uid": "graphene-37"
         },
         {
-
         },
         {
           "uid": "graphene-39"
@@ -141,10 +139,8 @@
       "naming_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
           "kind": "switch",
@@ -158,7 +154,6 @@
   "model": "3com 4510G",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "nancy",
   "snmp_community": "public",
@@ -174,6 +169,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene2.json b/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
index 68f6540b4c0535c5e25ebb51ffba74a8a0c13fb9..96f1709a9f8dfa3120e607d4980cb1d55b5e3fae 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene2.json
@@ -10,7 +10,6 @@
       "naming_pattern": "GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "graphene-40"
@@ -126,10 +125,8 @@
       "naming_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
           "kind": "switch",
@@ -143,7 +140,6 @@
   "model": "3com 4510G",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "nancy",
   "snmp_community": "public",
@@ -159,6 +155,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene3.json b/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
index 8ac7c3001e79f97dd04e268f6dbf4efe71a1b29d..a5648441cc922a2a0417d74c1128f7e4e093ab5c 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene3.json
@@ -10,7 +10,6 @@
       "naming_pattern": "GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "graphene-76"
@@ -111,10 +110,8 @@
       "naming_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
           "kind": "switch",
@@ -128,7 +125,6 @@
   "model": "3com 4510G",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "nancy",
   "snmp_community": "public",
@@ -144,6 +140,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraphene4.json b/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
index d6ab7840500525938b94fbe7e6f9ba5c0b9186db..28d706a3e6732aa289de09278d76dd6d54410006 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgraphene4.json
@@ -10,7 +10,6 @@
       "naming_pattern": "GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "graphene-105"
@@ -141,7 +140,6 @@
       "naming_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "switch",
@@ -155,7 +153,6 @@
   "model": "3com 4510G",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "nancy",
   "snmp_community": "public",
@@ -171,6 +168,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgrapheneib.json b/data/grid5000/sites/nancy/network_equipments/sgrapheneib.json
index 483b6bc6f28c7055cc096143577e1751a2202d1f..c9352c626737aaf176f0ccd33d00f7f181434ac3 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgrapheneib.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgrapheneib.json
@@ -1,85 +1,60 @@
 {
-  "backplane_bps": null,
   "channels": {
     "naming_pattern": "Po%CHANNELID%"
   },
   "kind": "switch",
   "linecards": [
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
-
     },
     {
       "kind": "switch",
       "naming_pattern": "%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "switch",
@@ -91,9 +66,7 @@
     }
   ],
   "model": "Infiniband",
-  "mtu": null,
   "routes": {
-
   },
   "site": "nancy",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/nancy/network_equipments/sgravillon1.json b/data/grid5000/sites/nancy/network_equipments/sgravillon1.json
index e401a4d6d40d1c29908158e7c2e7fc94a02ea757..b473c3a6af1274eb49e974d33a9c02456ec85f20 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgravillon1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgravillon1.json
@@ -31,7 +31,6 @@
   "kind": "switch",
   "linecards": [
     {
-
     },
     {
       "backplane_bps": 14400000000,
@@ -40,7 +39,6 @@
       "naming_pattern": "%LINECARD:A%%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "other",
@@ -60,13 +58,10 @@
           "uid": "stalc1"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -89,7 +84,6 @@
           "uid": "fgriffon1"
         },
         {
-
         },
         {
           "kind": "other",
@@ -108,24 +102,20 @@
           "uid": "sgraphene4-ipmi"
         },
         {
-
         },
         {
           "kind": "virtual",
           "uid": "LORIA"
         },
         {
-
         },
         {
           "kind": "other",
           "uid": "sgriffon1-ipmi"
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -143,7 +133,6 @@
       "naming_pattern": "%LINECARD:B%%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "sgriffon1"
@@ -159,7 +148,6 @@
       "naming_pattern": "%LINECARD:C%%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "sgraphene1"
@@ -168,7 +156,6 @@
           "uid": "sgraphene2"
         },
         {
-
         },
         {
           "uid": "sgraphene4"
@@ -184,7 +171,6 @@
       "naming_pattern": "%LINECARD:D%%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "other",
@@ -197,7 +183,6 @@
           "uid": "fgriffon2"
         },
         {
-
         },
         {
           "kind": "switch",
@@ -208,7 +193,6 @@
       "snmp_pattern": "D%PORT%"
     },
     {
-
     },
     {
       "backplane_bps": 14400000000,
@@ -217,20 +201,16 @@
       "naming_pattern": "%LINECARD:F%%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "router",
           "uid": "gw-nancy"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "virtual",
@@ -248,7 +228,6 @@
   "model": "HP Procurve 5406zl J8697A",
   "mtu": 9220,
   "routes": {
-
   },
   "site": "nancy",
   "snmp_community": "public",
@@ -334,6 +313,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
index 501da9169349263c288a0692002e8b5b4086d921..c73e0b272f5ec3584cfb5910ccf9ad73d8059787 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
@@ -10,7 +10,6 @@
       "naming_pattern": "GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "griffon-1"
@@ -52,22 +51,16 @@
           "uid": "griffon-60"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth1",
@@ -78,13 +71,10 @@
           "uid": "griffon-13"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "uid": "griffon-11"
@@ -160,10 +150,8 @@
       "naming_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
           "kind": "switch",
@@ -177,7 +165,6 @@
   "model": "3com 4500g",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "nancy",
   "snmp_community": "public",
@@ -193,6 +180,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc1.json b/data/grid5000/sites/nancy/network_equipments/stalc1.json
index 5f97c7173804aa319c0d4a29820b577ce0d6e31a..74c597a5539c8f6ca7e31a6b636cb5835089fa49 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc1.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc1.json
@@ -10,21 +10,18 @@
       "naming_pattern": "GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "port": "eth0",
           "uid": "talc-1"
         },
         {
-
         },
         {
           "port": "eth0",
           "uid": "talc-2"
         },
         {
-
         },
         {
           "port": "eth0",
@@ -103,7 +100,6 @@
           "uid": "graphique-6"
         },
         {
-
         },
         {
           "port": "eth0",
@@ -206,10 +202,8 @@
       "naming_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
           "uid": "stalc3"
@@ -223,7 +217,6 @@
       "naming_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "switch",
@@ -243,7 +236,6 @@
   "model": "3com 4500G",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "nancy",
   "snmp_community": "public",
@@ -259,6 +251,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc2.json b/data/grid5000/sites/nancy/network_equipments/stalc2.json
index 21caf9406bbce60f6959a14aef277405f57e3edb..d366dd1aa3a34f07ea2badf62d6973b0925c4933 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc2.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc2.json
@@ -10,13 +10,10 @@
       "naming_pattern": "GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth0",
@@ -67,34 +64,24 @@
           "uid": "talc-49"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth0",
@@ -177,7 +164,6 @@
       "naming_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "stalc4"
@@ -194,7 +180,6 @@
       "naming_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "other",
@@ -214,7 +199,6 @@
   "model": "3com 4500G",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "nancy",
   "snmp_community": "public",
@@ -230,6 +214,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc3.json b/data/grid5000/sites/nancy/network_equipments/stalc3.json
index a108f7148e42f645100f596a8d0ea4f98452342a..79a613db3302053e217fb6410289dc5456390c50 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc3.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc3.json
@@ -10,7 +10,6 @@
       "naming_pattern": "GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "port": "eth0",
@@ -93,16 +92,12 @@
           "uid": "talc-87"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth0",
@@ -185,7 +180,6 @@
       "naming_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "stalc1"
@@ -201,7 +195,6 @@
   "model": "3com 4500G",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "nancy",
   "snmp_community": "public",
@@ -217,6 +210,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/stalc4.json b/data/grid5000/sites/nancy/network_equipments/stalc4.json
index c19c65288c85e40cb877d094fa87c8027ae1acc7..427ea78017d409bd1ad707913e36ff3fa5865e51 100644
--- a/data/grid5000/sites/nancy/network_equipments/stalc4.json
+++ b/data/grid5000/sites/nancy/network_equipments/stalc4.json
@@ -10,7 +10,6 @@
       "naming_pattern": "GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "port": "eth0",
@@ -81,7 +80,6 @@
           "uid": "talc-121"
         },
         {
-
         },
         {
           "port": "eth0",
@@ -92,16 +90,12 @@
           "uid": "talc-124"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth0",
@@ -144,7 +138,6 @@
       "naming_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "stalc2"
@@ -157,7 +150,6 @@
   "model": "3com 4500G",
   "mtu": 9216,
   "routes": {
-
   },
   "site": "nancy",
   "snmp_community": "public",
@@ -173,6 +165,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ 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-nantes.json
index 8311a962c3b4d265faaa24bf5704b54617799933..90f94bfec42f9e1e1b04765c680c5108abaa00ec 100644
--- a/data/grid5000/sites/nantes/network_equipments/gw-nantes.json
+++ b/data/grid5000/sites/nantes/network_equipments/gw-nantes.json
@@ -16,40 +16,28 @@
           "uid": "renater-nantes"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "uid": "econome-17"
@@ -82,19 +70,14 @@
           "uid": "econome-18"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "uid": "econome-20"
@@ -109,22 +92,16 @@
           "uid": "econome-21"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "uid": "econome-14"
@@ -158,7 +135,6 @@
   "model": "Force10 S4810",
   "mtu": 1500,
   "routes": {
-
   },
   "site": "nantes",
   "snmp_community": "public",
@@ -245,6 +221,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/reims/network_equipments/gw-reims.json b/data/grid5000/sites/reims/network_equipments/gw-reims.json
index 2c55c5794afd144c08f1e0c5a8237a164915bb30..1c7f66067613363eda81b7e52dcea39ea5227651 100644
--- a/data/grid5000/sites/reims/network_equipments/gw-reims.json
+++ b/data/grid5000/sites/reims/network_equipments/gw-reims.json
@@ -11,7 +11,6 @@
       "naming_pattern": "Gi%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "stremi-1"
@@ -146,16 +145,12 @@
           "uid": "stremi-44"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "virtual",
@@ -169,7 +164,6 @@
   "model": "Cisco C3560E-48TD-S",
   "mtu": 9198,
   "routes": {
-
   },
   "site": "reims",
   "snmp_community": "public",
@@ -260,6 +254,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json b/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
index 92d24b0f4ebca6a54b9609df274458821f95503b..e48586056fb603dc82097cccb35daa2d47bbfc14 100644
--- a/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
+++ b/data/grid5000/sites/rennes/network_equipments/bigdata-sw.json
@@ -16,56 +16,40 @@
           "uid": "c6509"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
           "uid": "srv-bigdata"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -88,58 +72,40 @@
           "uid": "paranoia-3"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -169,7 +135,6 @@
   "model": "Force10 S4810",
   "mtu": 1500,
   "routes": {
-
   },
   "site": "rennes",
   "snmp_community": "public",
@@ -185,6 +150,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ 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 85ed83abd792e77cd9bac00c8c47bee4198f5a7a..eae437d8fd8e57384d788598cfefa0e0aa35d0d8 100644
--- a/data/grid5000/sites/rennes/network_equipments/c6509.json
+++ b/data/grid5000/sites/rennes/network_equipments/c6509.json
@@ -7,7 +7,6 @@
   "kind": "switch",
   "linecards": [
     {
-
     },
     {
       "backplane_bps": 40000000000,
@@ -16,10 +15,8 @@
       "naming_pattern": "Te%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
           "kind": "router",
@@ -40,99 +37,71 @@
       "naming_pattern": "Gi%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth2",
           "uid": "paranoia-3"
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth2",
           "uid": "paranoia-7"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "uid": "parapluie-5"
         },
         {
-
         },
         {
           "uid": "parapluie-10"
@@ -199,34 +168,28 @@
       "naming_pattern": "Gi%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "port": "eth2",
           "uid": "paranoia-4"
         },
         {
-
         },
         {
           "port": "eth2",
           "uid": "paranoia-1"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth2",
           "uid": "paranoia-5"
         },
         {
-
         },
         {
           "port": "eth2",
@@ -237,104 +200,73 @@
           "uid": "paranoia-6"
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth2",
           "uid": "paranoia-8"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "uid": "parapluie-1"
         },
         {
-
         },
         {
           "uid": "parapluie-7"
@@ -362,97 +294,66 @@
       "naming_pattern": "Gi%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "uid": "parapluie-28"
@@ -491,19 +392,15 @@
           "uid": "parapluie-30"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "uid": "parapluie-26"
         },
         {
-
         },
         {
           "uid": "parapluie-29"
@@ -513,7 +410,6 @@
       "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
     },
     {
-
     },
     {
       "backplane_bps": 40000000000,
@@ -522,115 +418,79 @@
       "naming_pattern": "Gi%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "uid": "parapluie-33"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "uid": "parapide-24"
@@ -678,112 +538,77 @@
       "naming_pattern": "Gi%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "uid": "parapide-3"
         },
         {
-
         },
         {
           "uid": "parapide-21"
@@ -813,7 +638,6 @@
           "uid": "parapide-5"
         },
         {
-
         },
         {
           "uid": "parapide-4"
@@ -835,55 +659,38 @@
       "naming_pattern": "Gi%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         }
       ],
       "rate": 1000000000,
@@ -892,13 +699,10 @@
   ],
   "model": "Cisco WS-C6509-E",
   "mtu": 9216,
-  "routes": null,
   "site": "rennes",
   "snmp_community": "privkavlan",
   "type": "network_equipment",
   "uid": "c6509",
-  "vlans": null,
   "weathermap": {
-
   }
 }
\ 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-rennes.json
index df33dac517e6063275bab684fcd87a1ca5fa925b..3d1ca757388f5231a3696b4592c800e8ebbaae11 100644
--- a/data/grid5000/sites/rennes/network_equipments/gw-rennes.json
+++ b/data/grid5000/sites/rennes/network_equipments/gw-rennes.json
@@ -31,13 +31,11 @@
   "kind": "router",
   "linecards": [
     {
-
     },
     {
       "naming_pattern": "Ethernet%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "node",
@@ -307,7 +305,6 @@
       "naming_pattern": "Ethernet%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "node",
@@ -350,46 +347,32 @@
           "uid": "parasilo-28"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "router",
@@ -407,7 +390,6 @@
   "model": "Nexus 56128P",
   "mtu": 1500,
   "routes": {
-
   },
   "site": "rennes",
   "snmp_community": "public",
@@ -494,6 +476,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ 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 256b52035b239db1886c8353681aaaa55b01e1ed..ebeb5e0450019b747cc1f433a8b96748d35cf7e3 100644
--- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
+++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-1.json
@@ -19,13 +19,11 @@
   "kind": "switch",
   "linecards": [
     {
-
     },
     {
       "naming_pattern": "Ethernet%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "node",
@@ -285,7 +283,6 @@
       "naming_pattern": "Ethernet%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "node",
@@ -415,14 +412,11 @@
   "model": "Nexus 56128P",
   "mtu": 1500,
   "routes": {
-
   },
   "site": "rennes",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "paravance-sw-1",
-  "vlans": null,
   "weathermap": {
-
   }
 }
\ 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 3a2db88c9dc7b6cd32743f796fdc2d87ae5951c0..9e4acd7d4552a0d579a3d05282c0b8eb87265689 100644
--- a/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
+++ b/data/grid5000/sites/rennes/network_equipments/paravance-sw-2.json
@@ -19,13 +19,11 @@
   "kind": "switch",
   "linecards": [
     {
-
     },
     {
       "naming_pattern": "Ethernet%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "node",
@@ -268,10 +266,8 @@
           "uid": "paravance-60"
         },
         {
-
         },
         {
-
         },
         {
           "kind": "router",
@@ -291,7 +287,6 @@
       "naming_pattern": "Ethernet%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "node",
@@ -421,14 +416,11 @@
   "model": "Nexus 56128P",
   "mtu": 1500,
   "routes": {
-
   },
   "site": "rennes",
   "snmp_community": "public",
   "type": "network_equipment",
   "uid": "paravance-sw-2",
-  "vlans": null,
   "weathermap": {
-
   }
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/edgeiron.json b/data/grid5000/sites/sophia/network_equipments/edgeiron.json
index df856fb7acccfd5e8f29824f061e7c628f57b108..750b1c2b6b05972858ccb43fb763453f2d9cd96a 100644
--- a/data/grid5000/sites/sophia/network_equipments/edgeiron.json
+++ b/data/grid5000/sites/sophia/network_equipments/edgeiron.json
@@ -10,7 +10,6 @@
       "naming_pattern": "%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "port": "ethernet2/1",
@@ -29,252 +28,172 @@
       "naming_pattern": "%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         }
       ],
       "rate": 1000000000,
       "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
     },
     {
-
     },
     {
       "kind": "node",
       "naming_pattern": "%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         }
       ],
       "rate": 1000000000,
@@ -284,7 +203,6 @@
   "model": "Foundry",
   "mtu": 10240,
   "routes": {
-
   },
   "site": "sophia",
   "snmp_community": "public",
diff --git a/data/grid5000/sites/sophia/network_equipments/gw-sophia.json b/data/grid5000/sites/sophia/network_equipments/gw-sophia.json
index 4ab4b57191301ff0dca7885ea1b5dc6e74765bfc..a0b97dedde96238d7b9ead312673da8b5cfbdd8a 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw-sophia.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw-sophia.json
@@ -6,7 +6,6 @@
   "kind": "router",
   "linecards": [
     {
-
     },
     {
       "backplane_bps": null,
@@ -14,7 +13,6 @@
       "naming_pattern": "ethernet%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "renater",
@@ -31,7 +29,6 @@
       "naming_pattern": "ethernet%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "port": "0/1",
@@ -51,7 +48,6 @@
       "naming_pattern": "ethernet%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "sol-1"
@@ -135,7 +131,6 @@
       "naming_pattern": "ethernet%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "sol-13"
@@ -219,7 +214,6 @@
       "naming_pattern": "ethernet%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "suno-3"
@@ -261,25 +255,21 @@
           "uid": "suno-13"
         },
         {
-
         },
         {
           "uid": "suno-17"
         },
         {
-
         },
         {
           "uid": "suno-15"
         },
         {
-
         },
         {
           "uid": "suno-14"
         },
         {
-
         },
         {
           "uid": "suno-16"
@@ -294,7 +284,6 @@
       "naming_pattern": "ethernet%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "suno-18"
@@ -390,7 +379,6 @@
       "naming_pattern": "ethernet%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "uid": "suno-36"
@@ -423,25 +411,18 @@
           "uid": "suno-45"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -449,16 +430,12 @@
           "uid": "srv2"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "kind": "other",
@@ -475,7 +452,6 @@
       "snmp_pattern": "GigabitEthernet%LINECARD%/%PORT%"
     },
     {
-
     },
     {
       "backplane_bps": 12000000000,
@@ -483,43 +459,35 @@
       "naming_pattern": "ethernet%LINECARD%/%PORT%",
       "ports": [
         {
-
         },
         {
           "kind": "node",
           "uid": "sol-49"
         },
         {
-
         },
         {
           "kind": "node",
           "uid": "sol-50"
         },
         {
-
         },
         {
-
         },
         {
           "uid": "sw-myrinet"
         },
         {
-
         },
         {
-
         },
         {
-
         },
         {
           "port": "eth0",
           "uid": "stock"
         },
         {
-
         },
         {
           "port": "eth1",
@@ -533,7 +501,6 @@
   "model": "Foundry",
   "mtu": 10240,
   "routes": {
-
   },
   "site": "sophia",
   "snmp_community": "public",
@@ -645,6 +612,5 @@
     }
   },
   "weathermap": {
-
   }
 }
\ No newline at end of file