diff --git a/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json b/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json index db33d04dafc4311471f3a3ff011c489b1728dff9..a8bd47082163b736835328bf907030b00fdb10c9 100644 --- a/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json +++ b/data/grid5000/sites/luxembourg/network_equipments/gw-luxembourg.json @@ -584,39 +584,54 @@ ], "administrative": true }, + "vlan701": { + "addresses": [ + "192.168.192.0/20" + ] + }, + "vlan702": { + "addresses": [ + "192.168.208.0/20" + ] + }, + "vlan703": { + "addresses": [ + "192.168.224.0/20" + ] + }, "vlan704": { "addresses": [ - "10.40.63.254" + "10.40.0.0/18" ] }, "vlan705": { "addresses": [ - "10.40.127.254" + "10.40.64.0/18" ] }, "vlan706": { "addresses": [ - "10.40.191.254" + "10.40.128.0/18" ] }, "vlan707": { "addresses": [ - "10.40.255.254" + "10.40.192.0/18" ] }, "vlan708": { "addresses": [ - "10.41.63.254" + "10.41.0.0/18" ] }, "vlan709": { "addresses": [ - "10.41.127.254" + "10.41.64.0/18" ] }, "vlan720": { "addresses": [ - "10.43.255.254" + "10.43.192.0/18" ] } }, diff --git a/generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml b/generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml index 2326725063682341e2d9408053a58d99cba7f098..2292f2cbf7ec7a551beaa9637f8fed6946803505 100644 --- a/generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml +++ b/generators/input/sites/luxembourg/net-links/gw-luxembourg.yaml @@ -8,6 +8,10 @@ gw-luxembourg: mtu: 9216 vlans: naming_pattern: Vlan%VLANID% + "vlan50": + administrative: yes + addresses: + - 192.168.15.254 "vlan100": administrative: yes addresses: @@ -15,11 +19,7 @@ gw-luxembourg: "vlan101": administrative: yes addresses: - - 172.17.191.254 - "vlan50": - administrative: yes - addresses: - - 192.168.15.254 + - 172.17.191.254 "vlan103": administrative: yes addresses: @@ -28,27 +28,36 @@ gw-luxembourg: administrative: yes addresses: - 192.168.4.21 + "vlan701": + addresses: + - 192.168.192.0/20 + "vlan702": + addresses: + - 192.168.208.0/20 + "vlan703": + addresses: + - 192.168.224.0/20 "vlan704": addresses: - - 10.40.63.254 + - 10.40.0.0/18 "vlan705": addresses: - - 10.40.127.254 + - 10.40.64.0/18 "vlan706": addresses: - - 10.40.191.254 + - 10.40.128.0/18 "vlan707": addresses: - - 10.40.255.254 + - 10.40.192.0/18 "vlan708": addresses: - - 10.41.63.254 + - 10.41.0.0/18 "vlan709": addresses: - - 10.41.127.254 + - 10.41.64.0/18 "vlan720": addresses: - - 10.43.255.254 + - 10.43.192.0/18 routes: {} linecards: