diff --git a/input/grid5000/vlans.yaml b/input/grid5000/vlans.yaml
index 103ef104f1099732cd43358549622c662b6670bd..0e380a75479053cd1f738b37402adf86b29b0258 100644
--- a/input/grid5000/vlans.yaml
+++ b/input/grid5000/vlans.yaml
@@ -60,156 +60,156 @@ vlans:
# global: 63.255 (/18 network)
# routed: SITEID.63.255 (/18 network per site)
offsets: |-
- local grenoble yeti eth0 0 0 2 110
- local grenoble dahu eth0 0 0 2 120
+ local grenoble yeti eth0 0 0 0 0
+ local grenoble dahu eth0 0 0 1 0
local lille chetemi eth0 0 0 0 0
- local lille chetemi eth1 0 0 0 15
- local lille chifflet eth0 0 0 1 0
- local lille chifflet eth1 0 0 1 8
- local lille chifflot eth0 0 0 2 0
- local lille chifflot eth1 0 0 2 8
- local lille chiclet eth0 0 0 3 0
- local lille chiclet eth1 0 0 3 8
- local luxembourg granduc eth0 0 0 1 0
- local luxembourg granduc eth1 0 0 2 0
- local luxembourg petitprince eth0 0 0 3 0
- local luxembourg petitprince eth1 0 0 4 0
+ local lille chetemi eth1 0 0 1 0
+ local lille chifflet eth0 0 0 2 0
+ local lille chifflet eth1 0 0 3 0
+ local lille chifflot eth0 0 0 4 0
+ local lille chifflot eth1 0 0 5 0
+ local lille chiclet eth0 0 0 6 0
+ local lille chiclet eth1 0 0 7 0
+ local luxembourg granduc eth0 0 0 0 0
+ local luxembourg granduc eth1 0 0 1 0
+ local luxembourg petitprince eth0 0 0 2 0
+ local luxembourg petitprince eth1 0 0 3 0
local lyon sagittaire eth1 0 0 0 0
- local lyon taurus eth0 0 0 0 79
- local lyon orion eth0 0 0 0 95
- local lyon hercule eth1 0 0 0 99
- local lyon nova eth0 0 0 0 111
- local nancy griffon eth0 0 0 1 0
- local nancy graphene eth0 0 0 2 0
- local nancy grcinq eth0 0 0 3 0
- local nancy grvingt eth0 0 0 3 48
+ local lyon taurus eth0 0 0 1 0
+ local lyon orion eth0 0 0 2 0
+ local lyon hercule eth1 0 0 3 0
+ local lyon nova eth0 0 0 4 0
+ local nancy griffon eth0 0 0 0 0
+ local nancy graphene eth0 0 0 1 0
+ local nancy grcinq eth0 0 0 2 0
+ local nancy grvingt eth0 0 0 3 0
local nancy graphite eth0 0 0 4 0
- local nancy graphique eth0 0 0 8 0
- local nancy graoully eth0 0 0 9 0
- local nancy grimoire eth0 0 0 10 0
- local nancy grimoire eth1 0 0 10 10
- local nancy grimoire eth2 0 0 10 20
- local nancy grimoire eth3 0 0 10 30
- local nancy grisou eth0 0 0 11 0
- local nancy grisou eth1 0 0 11 60
- local nancy grisou eth2 0 0 11 120
- local nancy grisou eth3 0 0 11 180
- local nancy grimani eth0 0 0 12 0
- local nancy grisou eth4 0 0 12 6
- local nancy grele eth0 0 0 12 57
+ local nancy graphique eth0 0 0 5 0
+ local nancy graoully eth0 0 0 6 0
+ local nancy grimoire eth0 0 0 7 0
+ local nancy grimoire eth1 0 0 7 10
+ local nancy grimoire eth2 0 0 7 20
+ local nancy grimoire eth3 0 0 7 30
+ local nancy grisou eth0 0 0 8 0
+ local nancy grisou eth1 0 0 8 100
+ local nancy grisou eth2 0 0 8 200
+ local nancy grisou eth3 0 0 9 0
+ local nancy grisou eth4 0 0 9 100
+ local nancy grimani eth0 0 0 10 0
+ local nancy grele eth0 0 0 11 0
local nantes econome eth0 0 0 0 0
local nantes ecotype eth0 0 0 1 0
- local nantes ecotype eth1 0 0 1 48
- local rennes parapide eth0 0 0 3 0
- local rennes parapluie eth1 0 0 4 0
- local rennes paranoia eth0 0 0 5 0
- local rennes paranoia eth2 0 0 6 0
- local rennes paranoia eth1 0 0 7 0
- local rennes paravance eth0 0 0 8 0
- local rennes paravance eth1 0 0 9 0
- local rennes parasilo eth0 0 0 12 0
- local rennes parasilo eth1 0 0 13 0
- local sophia suno eth0 0 0 3 0
- local sophia uvb eth0 0 0 5 0
- global grenoble yeti eth0 0 0 2 110
- global grenoble dahu eth0 0 0 2 120
- global lille chetemi eth0 0 0 4 0
- global lille chetemi eth1 0 0 4 15
- global lille chifflet eth0 0 0 4 30
- global lille chifflet eth1 0 0 4 38
- global lille chifflot eth0 0 0 4 46
- global lille chifflot eth1 0 0 4 54
- global lille chiclet eth0 0 0 4 62
- global lille chiclet eth1 0 0 4 70
- global lyon sagittaire eth1 0 0 6 0
- global lyon taurus eth0 0 0 6 79
- global lyon orion eth0 0 0 6 95
- global lyon hercule eth1 0 0 6 99
- global lyon nova eth0 0 0 6 111
- global nancy grimoire eth0 0 0 7 0
- global nancy grimoire eth1 0 0 7 8
- global nancy grimoire eth2 0 0 7 16
- global nancy grimoire eth3 0 0 7 24
- global nancy grisou eth0 0 0 7 32
- global nancy grisou eth1 0 0 7 83
- global nancy grisou eth2 0 0 7 134
- global nancy grisou eth3 0 0 7 185
- global nancy grele eth0 0 0 8 0
- global nancy griffon eth0 0 0 8 14
- global nancy graphene eth0 0 0 8 92
- global nancy graphite eth0 0 0 8 236
- global nancy grcinq eth0 0 0 9 0
- global nancy grvingt eth0 0 0 9 48
- global nancy graphique eth0 0 0 9 142
- global nancy graoully eth0 0 0 9 148
- global nancy grisou eth4 0 0 9 164
- global nancy grimani eth0 0 0 9 215
- global rennes paravance eth0 0 0 12 1
- global rennes paravance eth1 0 0 12 73
- global rennes parasilo eth0 0 0 12 145
- global rennes parasilo eth1 0 0 12 173
- global rennes paranoia eth0 0 0 12 201
- global rennes paranoia eth1 0 0 12 209
- global rennes paranoia eth2 0 0 12 217
- global rennes parapide eth0 0 0 12 225
- global rennes parapluie eth1 0 0 13 1
- global sophia uvb eth0 0 0 16 0
- global sophia suno eth0 0 0 16 106
- global luxembourg granduc eth0 0 0 20 0
- global luxembourg granduc eth1 0 0 20 22
- global luxembourg petitprince eth0 0 0 21 0
- global luxembourg petitprince eth1 0 0 21 16
- global nantes econome eth0 0 0 22 0
- global nantes ecotype eth0 0 0 22 22
- global nantes ecotype eth1 0 0 22 70
- routed grenoble yeti eth0 0 4 2 110
- routed grenoble dahu eth0 0 4 2 120
+ local nantes ecotype eth1 0 0 2 0
+ local rennes parapide eth0 0 0 0 0
+ local rennes parapluie eth1 0 0 1 0
+ local rennes paranoia eth0 0 0 2 0
+ local rennes paranoia eth2 0 0 3 0
+ local rennes paranoia eth1 0 0 4 0
+ local rennes paravance eth0 0 0 5 0
+ local rennes paravance eth1 0 0 6 0
+ local rennes parasilo eth0 0 0 7 0
+ local rennes parasilo eth1 0 0 8 0
+ local sophia suno eth0 0 0 0 0
+ local sophia uvb eth0 0 0 1 0
+ global grenoble yeti eth0 0 0 0 0
+ global grenoble dahu eth0 0 0 1 0
+ global lille chetemi eth0 0 0 2 0
+ global lille chetemi eth1 0 0 2 100
+ global lille chifflet eth0 0 0 3 0
+ global lille chifflet eth1 0 0 3 100
+ global lille chifflot eth0 0 0 4 0
+ global lille chifflot eth1 0 0 4 100
+ global lille chiclet eth0 0 0 5 0
+ global lille chiclet eth1 0 0 5 100
+ global lyon sagittaire eth1 0 0 8 0
+ global lyon taurus eth0 0 0 9 0
+ global lyon orion eth0 0 0 10 0
+ global lyon hercule eth1 0 0 11 0
+ global lyon nova eth0 0 0 12 0
+ global nancy grimoire eth0 0 0 16 0
+ global nancy grimoire eth1 0 0 16 10
+ global nancy grimoire eth2 0 0 16 20
+ global nancy grimoire eth3 0 0 16 30
+ global nancy grisou eth0 0 0 17 0
+ global nancy grisou eth1 0 0 17 100
+ global nancy grisou eth2 0 0 17 200
+ global nancy grisou eth3 0 0 18 0
+ global nancy grisou eth4 0 0 18 100
+ global nancy grele eth0 0 0 19 0
+ global nancy griffon eth0 0 0 20 0
+ global nancy graphene eth0 0 0 21 0
+ global nancy graphite eth0 0 0 22 0
+ global nancy grcinq eth0 0 0 23 0
+ global nancy grvingt eth0 0 0 24 0
+ global nancy graphique eth0 0 0 25 0
+ global nancy graoully eth0 0 0 26 0
+ global nancy grimani eth0 0 0 27 0
+ global rennes paravance eth0 0 0 32 0
+ global rennes paravance eth1 0 0 32 100
+ global rennes parasilo eth0 0 0 33 0
+ global rennes parasilo eth1 0 0 33 100
+ global rennes paranoia eth0 0 0 34 0
+ global rennes paranoia eth1 0 0 34 100
+ global rennes paranoia eth2 0 0 34 200
+ global rennes parapide eth0 0 0 35 0
+ global rennes parapluie eth1 0 0 36 0
+ global sophia uvb eth0 0 0 40 0
+ global sophia suno eth0 0 0 41 0
+ global luxembourg granduc eth0 0 0 45 0
+ global luxembourg granduc eth1 0 0 45 100
+ global luxembourg petitprince eth0 0 0 46 0
+ global luxembourg petitprince eth1 0 0 46 100
+ global nantes econome eth0 0 0 48 0
+ global nantes ecotype eth0 0 0 49 0
+ global nantes ecotype eth1 0 0 49 100
+ routed grenoble yeti eth0 0 4 0 0
+ routed grenoble dahu eth0 0 4 1 0
routed lille chetemi eth0 0 8 0 0
- routed lille chetemi eth1 0 8 0 15
- routed lille chifflet eth0 0 8 1 0
- routed lille chifflet eth1 0 8 1 8
- routed lille chifflot eth0 0 8 2 0
- routed lille chifflot eth1 0 8 2 8
- routed lille chiclet eth0 0 8 3 0
- routed lille chiclet eth1 0 8 3 8
+ routed lille chetemi eth1 0 8 1 0
+ routed lille chifflet eth0 0 8 2 0
+ routed lille chifflet eth1 0 8 3 0
+ routed lille chifflot eth0 0 8 4 0
+ routed lille chifflot eth1 0 8 5 0
+ routed lille chiclet eth0 0 8 6 0
+ routed lille chiclet eth1 0 8 7 8
routed lyon sagittaire eth1 0 12 0 0
- routed lyon taurus eth0 0 12 0 79
- routed lyon orion eth0 0 12 0 95
- routed lyon hercule eth1 0 12 0 99
- routed lyon nova eth0 0 12 0 111
- routed nancy griffon eth0 0 16 1 0
- routed nancy graphene eth0 0 16 2 0
- routed nancy grcinq eth0 0 16 3 0
- routed nancy grvingt eth0 0 16 3 48
+ routed lyon taurus eth0 0 12 1 0
+ routed lyon orion eth0 0 12 2 0
+ routed lyon hercule eth1 0 12 3 0
+ routed lyon nova eth0 0 12 4 0
+ routed nancy griffon eth0 0 16 0 0
+ routed nancy graphene eth0 0 16 1 0
+ routed nancy grcinq eth0 0 16 2 0
+ routed nancy grvingt eth0 0 16 3 0
routed nancy graphite eth0 0 16 4 0
- routed nancy graphique eth0 0 16 9 0
- routed nancy graoully eth0 0 16 10 0
- routed nancy grimoire eth0 0 16 11 0
- routed nancy grimoire eth1 0 16 11 10
- routed nancy grimoire eth2 0 16 11 20
- routed nancy grimoire eth3 0 16 11 30
- routed nancy grisou eth0 0 16 12 0
- routed nancy grisou eth1 0 16 12 60
- routed nancy grisou eth2 0 16 12 120
- routed nancy grisou eth3 0 16 12 180
- routed nancy grimani eth0 0 16 13 0
- routed nancy grisou eth4 0 16 13 6
- routed nancy grele eth0 0 16 13 57
- routed rennes parapide eth0 0 24 3 0
- routed rennes parapluie eth1 0 24 4 0
- routed rennes paranoia eth0 0 24 5 0
- routed rennes paranoia eth2 0 24 6 0
- routed rennes paranoia eth1 0 24 7 0
- routed rennes paravance eth0 0 24 8 0
- routed rennes paravance eth1 0 24 9 0
- routed rennes parasilo eth0 0 24 12 0
- routed rennes parasilo eth1 0 24 13 0
- routed sophia suno eth0 0 32 3 0
- routed sophia uvb eth0 0 32 5 0
- routed luxembourg granduc eth0 0 40 1 0
- routed luxembourg granduc eth1 0 40 2 0
- routed luxembourg petitprince eth0 0 40 3 0
- routed luxembourg petitprince eth1 0 40 4 0
+ routed nancy graphique eth0 0 16 5 0
+ routed nancy graoully eth0 0 16 6 0
+ routed nancy grimoire eth0 0 16 7 0
+ routed nancy grimoire eth1 0 16 7 10
+ routed nancy grimoire eth2 0 16 7 20
+ routed nancy grimoire eth3 0 16 7 30
+ routed nancy grisou eth0 0 16 8 0
+ routed nancy grisou eth1 0 16 8 100
+ routed nancy grisou eth2 0 16 8 200
+ routed nancy grisou eth3 0 16 9 0
+ routed nancy grisou eth4 0 16 9 100
+ routed nancy grimani eth0 0 16 10 0
+ routed nancy grele eth0 0 16 11 0
+ routed rennes parapide eth0 0 24 0 0
+ routed rennes parapluie eth1 0 24 1 0
+ routed rennes paranoia eth0 0 24 2 0
+ routed rennes paranoia eth2 0 24 3 0
+ routed rennes paranoia eth1 0 24 4 0
+ routed rennes paravance eth0 0 24 5 0
+ routed rennes paravance eth1 0 24 6 0
+ routed rennes parasilo eth0 0 24 7 0
+ routed rennes parasilo eth1 0 24 8 0
+ routed sophia suno eth0 0 32 0 0
+ routed sophia uvb eth0 0 32 1 0
+ routed luxembourg granduc eth0 0 40 0 0
+ routed luxembourg granduc eth1 0 40 1 0
+ routed luxembourg petitprince eth0 0 40 2 0
+ routed luxembourg petitprince eth1 0 40 3 0
routed nantes econome eth0 0 44 0 0
routed nantes ecotype eth0 0 44 1 0
- routed nantes ecotype eth1 0 44 1 48
+ routed nantes ecotype eth1 0 44 2 0