diff --git a/data/grid5000/sites/bordeaux/network_equipments/gw-bordeaux.json b/data/grid5000/sites/bordeaux/network_equipments/gw-bordeaux.json
index af1b7dbb072cdbf449376f638201c938c718e3bf..942402e187fa1e1388ccbc2d6c72888d0a01e3d0 100644
--- a/data/grid5000/sites/bordeaux/network_equipments/gw-bordeaux.json
+++ b/data/grid5000/sites/bordeaux/network_equipments/gw-bordeaux.json
@@ -447,13 +447,13 @@
   "type": "network_equipment",
   "uid": "gw-bordeaux",
   "vlans": {
-    "1": {
+    "naming_pattern": "Vlan%VLANID%",
+    "vlan1": {
       "addresses": [
         "172.16.15.254"
       ],
       "administrative": true
-    },
-    "naming_pattern": "Vlan%VLANID%"
+    }
   },
   "weathermap": {
 
diff --git a/data/grid5000/sites/bordeaux/network_equipments/sbordeplage1.json b/data/grid5000/sites/bordeaux/network_equipments/sbordeplage1.json
index dbd01543867b61f230e873a8a34e70834eaaf15d..11075c3e7fc6c31198e92a2cc2bce77fe70316bf 100644
--- a/data/grid5000/sites/bordeaux/network_equipments/sbordeplage1.json
+++ b/data/grid5000/sites/bordeaux/network_equipments/sbordeplage1.json
@@ -68,7 +68,13 @@
   "type": "network_equipment",
   "uid": "sbordeplage1",
   "vlans": {
-    "naming_pattern": "Vlan%VLANID%"
+    "naming_pattern": "Vlan%VLANID%",
+    "vlan100": {
+      "addresses": [
+        "172.16.15.201"
+      ],
+      "administrative": true
+    }
   },
   "weathermap": {
     "use_cacti": "no"
diff --git a/data/grid5000/sites/bordeaux/network_equipments/sbordeplage2.json b/data/grid5000/sites/bordeaux/network_equipments/sbordeplage2.json
index 1a755824d6847ce0e8f2e7205c0ce59d5a2a93d0..05e8380309e84c204f2117e02e3c6894b4a436eb 100644
--- a/data/grid5000/sites/bordeaux/network_equipments/sbordeplage2.json
+++ b/data/grid5000/sites/bordeaux/network_equipments/sbordeplage2.json
@@ -158,7 +158,13 @@
   "type": "network_equipment",
   "uid": "sbordeplage2",
   "vlans": {
-    "naming_pattern": "Vlan%VLANID%"
+    "naming_pattern": "Vlan%VLANID%",
+    "vlan100": {
+      "addresses": [
+        "172.16.15.202"
+      ],
+      "administrative": true
+    }
   },
   "weathermap": {
     "use_cacti": "no"
diff --git a/data/grid5000/sites/bordeaux/network_equipments/st-bordemer.json b/data/grid5000/sites/bordeaux/network_equipments/st-bordemer.json
index 3dce8e209f8f8181d46e2c0fda20819b051554c9..81607d177bbe35f263d8a8fc6425e2dd56496d54 100644
--- a/data/grid5000/sites/bordeaux/network_equipments/st-bordemer.json
+++ b/data/grid5000/sites/bordeaux/network_equipments/st-bordemer.json
@@ -103,13 +103,13 @@
   "type": "network_equipment",
   "uid": "st-bordemer",
   "vlans": {
-    "100": {
+    "naming_pattern": "Vlan%VLANID%",
+    "vlan100": {
       "addresses": [
         "172.16.15.200"
       ],
       "administrative": true
-    },
-    "naming_pattern": "Vlan%VLANID%"
+    }
   },
   "weathermap": {
 
diff --git a/generators/input/sites/bordeaux/net-links/gw-bordeaux.yaml b/generators/input/sites/bordeaux/net-links/gw-bordeaux.yaml
index a75eb0734aecbd5cc4330ed6eb50307dd4ebb116..441cffeb68d9bc76f4f835e47a289a4a344ee9f3 100644
--- a/generators/input/sites/bordeaux/net-links/gw-bordeaux.yaml
+++ b/generators/input/sites/bordeaux/net-links/gw-bordeaux.yaml
@@ -6,7 +6,7 @@ gw-bordeaux:
   snmp_community: public
   vlans:
     naming_pattern: Vlan%VLANID%
-    "1":
+    "vlan1":
       administrative: yes
       addresses:
         - 172.16.15.254
diff --git a/generators/input/sites/bordeaux/net-links/sbordeplage1.yaml b/generators/input/sites/bordeaux/net-links/sbordeplage1.yaml
index 040a0a8438fa6e5ec0362870b8a3833fd2501039..9fd9a62b86f106caa098c7f0241dc693c00c8d60 100644
--- a/generators/input/sites/bordeaux/net-links/sbordeplage1.yaml
+++ b/generators/input/sites/bordeaux/net-links/sbordeplage1.yaml
@@ -1,28 +1,31 @@
---- 
-sbordeplage1: 
+---
+sbordeplage1:
   model: PowerConnect 5324
   kind: switch
   site: bordeaux
   snmp_community: public
-  weathermap: 
+  weathermap:
     use_cacti: "no"
-  vlans: 
+  vlans:
     naming_pattern: Vlan%VLANID%
+    "vlan100":
+      administrative: yes
+      addresses:
+        - 172.16.15.201
   routes: {}
-
-  linecards: 
-    0: 
+  linecards:
+    0:
       naming_pattern: "%LINECARD%/%PORT%"
       kind: switch
       rate: 1000000000
-      ports: 
+      ports:
         0: st-bordemer
         1: dinkum-thinkum
-    1: 
+    1:
       naming_pattern: "%LINECARD%/%PORT%"
       kind: node
       rate: 1000000000
-      ports: 
+      ports:
         1: bordeplage-1
         2: bordeplage-2
         3: bordeplage-3
@@ -33,5 +36,5 @@ sbordeplage1:
         8: bordeplage-8
         9: bordeplage-9
         10: bordeplage-10
-  channels: 
+  channels:
     naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/bordeaux/net-links/sbordeplage2.yaml b/generators/input/sites/bordeaux/net-links/sbordeplage2.yaml
index e79d6dbd9d3bfe1e3040ad6d7f10b11de68dd8dc..5a5b536a4d57c0b60b9c4989379c14aefff2fae3 100644
--- a/generators/input/sites/bordeaux/net-links/sbordeplage2.yaml
+++ b/generators/input/sites/bordeaux/net-links/sbordeplage2.yaml
@@ -1,27 +1,31 @@
---- 
-sbordeplage2: 
+---
+sbordeplage2:
   model: PowerConnect 3424
   kind: switch
   site: bordeaux
   snmp_community: public
-  weathermap: 
+  weathermap:
     use_cacti: "no"
-  vlans: 
+  vlans:
     naming_pattern: Vlan%VLANID%
+    "vlan100":
+      administrative: yes
+      addresses:
+        - 172.16.15.202
   routes: {}
 
-  linecards: 
-    0: 
+  linecards:
+    0:
       naming_pattern: "%LINECARD%/%PORT%"
       kind: switch
       rate: 1000000000
-      ports: 
+      ports:
         0: st-bordemer
-    1: 
+    1:
       naming_pattern: "%LINECARD%/%PORT%"
       kind: node
       rate: 1000000000
-      ports: 
+      ports:
         1: bordeplage-11
         2: bordeplage-12
         3: bordeplage-13
@@ -63,5 +67,5 @@ sbordeplage2:
         39: bordeplage-49
         40: bordeplage-50
         41: bordeplage-51
-  channels: 
+  channels:
     naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/bordeaux/net-links/sborderline.yaml b/generators/input/sites/bordeaux/net-links/sborderline.yaml
index e0ac2e858a4582cf3594a64bff6ae3f58d537d55..acb5796a6c37263d0986e1facd276cae98a81213 100644
--- a/generators/input/sites/bordeaux/net-links/sborderline.yaml
+++ b/generators/input/sites/bordeaux/net-links/sborderline.yaml
@@ -1,27 +1,27 @@
---- 
-sborderline: 
+---
+sborderline:
   model: Nortel 5530
   kind: switch
   site: bordeaux
   snmp_community: public
-  weathermap: 
+  weathermap:
     use_cacti: "no"
-  vlans: 
+  vlans:
     naming_pattern: Vlan%VLANID%
   routes: {}
 
-  linecards: 
-    0: 
+  linecards:
+    0:
       naming_pattern: "%LINECARD%/%PORT%"
       kind: router
       rate: 10000000000
-      ports: 
+      ports:
         0: gw-bordeaux
-    1: 
+    1:
       naming_pattern: "%LINECARD%/%PORT%"
       kind: node
       rate: 1000000000
-      ports: 
+      ports:
         1: borderline-1
         2: borderline-2
         3: borderline-3
@@ -32,5 +32,5 @@ sborderline:
         8: borderline-8
         9: borderline-9
         10: borderline-10
-  channels: 
+  channels:
     naming_pattern: Po%CHANNELID%
diff --git a/generators/input/sites/bordeaux/net-links/st-bordemer.yaml b/generators/input/sites/bordeaux/net-links/st-bordemer.yaml
index 2bda31d240c404a4f8a5b54236181576815c7af2..f37e5739f68b4f7660c5db5a273f30bb84a974b3 100644
--- a/generators/input/sites/bordeaux/net-links/st-bordemer.yaml
+++ b/generators/input/sites/bordeaux/net-links/st-bordemer.yaml
@@ -1,23 +1,23 @@
---- 
-st-bordemer: 
+---
+st-bordemer:
   model: Cisco WS-C3750G-24TS
   kind: switch
   site: bordeaux
   snmp_community: public
-  vlans: 
+  vlans:
     naming_pattern: Vlan%VLANID%
-    "100": 
+    "vlan100":
       administrative: yes
-      addresses: 
+      addresses:
         - 172.16.15.200
   routes: {}
 
-  linecards: 
-    1: 
+  linecards:
+    1:
       naming_pattern: "Gi%LINECARD%/0/%PORT%"
       kind: router
       rate: 1000000000
-      ports: 
+      ports:
         25: gw-bordeaux
-  channels: 
+  channels:
     naming_pattern: Po%CHANNELID%