diff --git a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json index 8647a23a7b40a87cdbc254218f95b7bad39b4d87..96abbc9aa6ffdc0280c3de157961cf4fac44cc03 100644 --- a/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json +++ b/data/grid5000/sites/toulouse/network_equipments/gw-toulouse.json @@ -1,4 +1,5 @@ { + "backplane_bps": null, "channels": { "naming_pattern": "Po%CHANNELID%" }, @@ -349,13 +350,13 @@ "type": "network_equipment", "uid": "gw-toulouse", "vlans": { - "100": { + "naming_pattern": "Vlan%VLANID%", + "vlan100": { "addresses": [ "172.16.127.254" ], "administrative": true - }, - "naming_pattern": "Vlan%VLANID%" + } }, "weathermap": { diff --git a/data/grid5000/sites/toulouse/network_equipments/r4.json b/data/grid5000/sites/toulouse/network_equipments/r4.json index c68c800c4743edbb6b86223ffc9fd233209bcbb9..53d3a3462aa4f958ca5b319c133e0c080706c6eb 100644 --- a/data/grid5000/sites/toulouse/network_equipments/r4.json +++ b/data/grid5000/sites/toulouse/network_equipments/r4.json @@ -1,4 +1,5 @@ { + "backplane_bps": null, "channels": { "naming_pattern": "Po%CHANNELID%" }, @@ -293,13 +294,13 @@ "type": "network_equipment", "uid": "r4", "vlans": { - "100": { + "naming_pattern": "Vlan%VLANID%", + "vlan100": { "addresses": [ "172.16.127.201" ], "administrative": true - }, - "naming_pattern": "Vlan%VLANID%" + } }, "weathermap": { diff --git a/generators/input/sites/toulouse/net-links/gw-toulouse.yaml b/generators/input/sites/toulouse/net-links/gw-toulouse.yaml index f0422629c4706b2bba00adceb24765a7181a697c..080f52c502f3a1261de81182ab764e684e166b72 100644 --- a/generators/input/sites/toulouse/net-links/gw-toulouse.yaml +++ b/generators/input/sites/toulouse/net-links/gw-toulouse.yaml @@ -8,7 +8,7 @@ gw-toulouse: vlans: naming_pattern: Vlan%VLANID% - "100": + "vlan100": administrative: yes addresses: - 172.16.127.254 diff --git a/generators/input/sites/toulouse/net-links/r4.yaml b/generators/input/sites/toulouse/net-links/r4.yaml index caba7a76de68523df95ea1087e2e7b4e37253848..519fd7239ae29bd95eaf3727a14bc8c31af94312 100644 --- a/generators/input/sites/toulouse/net-links/r4.yaml +++ b/generators/input/sites/toulouse/net-links/r4.yaml @@ -8,7 +8,7 @@ r4: vlans: naming_pattern: Vlan%VLANID% - "100": + "vlan100": administrative: yes addresses: - 172.16.127.201