diff --git a/data/grid5000/sites/reims/network_equipments/gw.json b/data/grid5000/sites/reims/network_equipments/sw-grid-a.json
similarity index 98%
rename from data/grid5000/sites/reims/network_equipments/gw.json
rename to data/grid5000/sites/reims/network_equipments/sw-grid-a.json
index e1c3b7b13db50dcbdef1c69843c3835c726b5993..9edd3c25f25e724d2654af8af456e488d3f7e59d 100644
--- a/data/grid5000/sites/reims/network_equipments/gw.json
+++ b/data/grid5000/sites/reims/network_equipments/sw-grid-a.json
@@ -144,7 +144,7 @@
"uid": "stremi-44"
}
],
- "rate": 1000
+ "rate": 1000000
}
],
"model": "cisco",
@@ -154,7 +154,7 @@
"site": "reims",
"snmp_community": "public",
"type": "network_equipment",
- "uid": "gw",
+ "uid": "sw-grid-a",
"vlans": {
"naming_pattern": "Vlan%VLANID%"
}
diff --git a/generators/input/sites/reims/net-links/gw.yaml b/generators/input/sites/reims/net-links/gw.yaml
deleted file mode 100644
index c6f0aee6e81d1edae9e3179a630b8d68c51ed817..0000000000000000000000000000000000000000
--- a/generators/input/sites/reims/net-links/gw.yaml
+++ /dev/null
@@ -1,486 +0,0 @@
----
-- :vlans:
- - 1
- - 100
- - 101
- - 102
- - 540
- - 701
- - 702
- - 703
- - 704
- - 705
- - 706
- - 707
- - 708
- - 709
- - 710
- - 711
- - 712
- - 713
- - 714
- - 715
- - 716
- - 717
- - 718
- - 719
- - 720
- - 721
- :ifname: Gi0/48
- :mac: 6c:50:4d:28:8b:31
-- :fqdn: api-server-devel.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.116
- :mac: 00:16:3e:08:05:96
-- :fqdn: conman.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.113
- :mac: 00:16:3e:0b:12:3e
-- :fqdn: dns.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.104
- :mac: 00:16:3e:0d:da:e7
-- :fqdn: dhcp.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.102
- :mac: 00:16:3e:15:e4:9f
-- :fqdn: supervision.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.109
- :mac: 00:16:3e:2c:d9:94
-- :fqdn: api-proxy.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.110
- :mac: 00:16:3e:30:7c:f3
-- :fqdn: www.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.112
- :mac: 00:16:3e:4d:4c:21
-- :fqdn: ganglia.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.118
- :mac: 00:16:3e:5f:b2:60
-- :fqdn: mysql.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.105
- :mac: 00:16:3e:6b:e4:81
-- :fqdn: mail.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.114
- :mac: 00:16:3e:6c:62:aa
-- :fqdn: ldap.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.103
- :mac: 00:16:3e:72:58:b4
-- :fqdn: kadeploy.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.107
- :mac: 00:16:3e:78:eb:34
-- :fqdn: syslog.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.115
- :mac: 00:16:3e:7b:7c:a9
-- :fqdn: weathermap
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.119
- :mac: 00:16:3e:81:df:0d
-- :fqdn: oar.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.106
- :mac: 00:16:3e:cf:ae:30
-- :fqdn: freims.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.100
- :mac: 00:16:3e:ef:05:2e
-- :fqdn: api-server.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/45
- :ip: 172.16.175.111
- :mac: 00:16:3e:fa:e0:49
-- :fqdn: stremi-data.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Te0/2
- :ip: 172.16.175.2
- :mac: 00:1b:21:8d:d8:f5
-- :fqdn: stremi-17.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/17
- :ip: 172.16.160.17
- :mac: 1c:c1:de:6e:14:10
-- :vlans:
- - 100
- :ifname: Gi0/27
- :mac: 1c:c1:de:e8:2b:0c
-- :fqdn: stremi-20.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/20
- :ip: 172.16.160.20
- :mac: 1c:c1:de:eb:38:a2
-- :fqdn: stremi-11.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/11
- :ip: 172.16.160.11
- :mac: 1c:c1:de:eb:87:e4
-- :vlans:
- - 100
- :ifname: Gi0/29
- :mac: 78:e7:d1:fa:f2:f2
-- :fqdn: stremi-41.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/41
- :ip: 172.16.160.41
- :mac: d4:85:64:44:77:28
-- :vlans:
- - 100
- :ifname: Gi0/3
- :mac: d4:85:64:44:77:4a
-- :fqdn: stremi-23.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/23
- :ip: 172.16.160.23
- :mac: d4:85:64:45:07:20
-- :vlans:
- - 100
- :ifname: Gi0/2
- :mac: d4:85:64:45:07:94
-- :vlans:
- - 100
- :ifname: Gi0/14
- :mac: d4:85:64:45:07:b2
-- :fqdn: stremi-44.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/44
- :ip: 172.16.160.44
- :mac: d4:85:64:45:17:ce
-- :fqdn: stremi-40.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/40
- :ip: 172.16.160.40
- :mac: d4:85:64:45:17:d6
-- :vlans:
- - 100
- :ifname: Gi0/28
- :mac: d4:85:64:45:55:f0
-- :fqdn: stremi-15.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/15
- :ip: 172.16.160.15
- :mac: d4:85:64:45:65:08
-- :fqdn: stremi-34.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/33
- :ip: 172.16.160.34
- :mac: d4:85:64:45:65:fa
-- :vlans:
- - 100
- :ifname: Gi0/16
- :mac: d4:85:64:45:75:b2
-- :fqdn: stremi-12.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/12
- :ip: 172.16.160.12
- :mac: d4:85:64:45:85:30
-- :fqdn: stremi-9.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/9
- :ip: 172.16.160.9
- :mac: d4:85:64:45:85:32
-- :fqdn: stremi-7.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/7
- :ip: 172.16.160.7
- :mac: d4:85:64:45:95:4c
-- :vlans:
- - 100
- :ifname: Gi0/26
- :mac: d4:85:64:45:a5:44
-- :fqdn: stremi-19.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/19
- :ip: 172.16.160.19
- :mac: d4:85:64:45:b5:6e
-- :fqdn: stremi-25.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/25
- :ip: 172.16.160.25
- :mac: d4:85:64:45:b5:aa
-- :fqdn: stremi-30.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/30
- :ip: 172.16.160.30
- :mac: d4:85:64:45:c5:b6
-- :fqdn: stremi-5.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/5
- :ip: 172.16.160.5
- :mac: d4:85:64:45:d5:12
-- :vlans:
- - 100
- :ifname: Gi0/21
- :mac: d4:85:64:45:d5:fe
-- :vlans:
- - 100
- :ifname: Gi0/31
- :mac: d4:85:64:45:e5:ce
-- :fqdn: stremi-6.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/6
- :ip: 172.16.160.6
- :mac: d4:85:64:45:f5:26
-- :vlans:
- - 100
- :ifname: Gi0/22
- :mac: d4:85:64:45:f5:74
-- :fqdn: stremi-24.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/24
- :ip: 172.16.160.24
- :mac: d4:85:64:45:f6:9e
-- :fqdn: stremi-srv.reims.grid5000.fr
- :vlans:
- - 100
- :ifname: Gi0/46
- :ip: 172.16.175.1
- :mac: d4:85:64:68:de:3a
-- :vlans:
- - 101
- :ifname: Gi0/48
- :ip: 172.17.160.121
- :mac: 00:0d:5d:07:72:ea
-- :vlans:
- - 101
- :ifname: Gi0/48
- :ip: 172.17.160.122
- :mac: 00:0d:5d:07:72:f8
-- :vlans:
- - 101
- :ifname: Gi0/48
- :ip: 172.17.160.120
- :mac: 00:0d:5d:07:72:ff
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7a:12:89
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7a:67:f0
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7a:87:41
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7a:f1:f0
-- :vlans:
- - 101
- :ifname: Gi0/48
- :ip: 172.17.160.1
- :mac: 1c:c1:de:7b:16:d1
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:16:db
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:16:e8
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:16:eb
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:16:fa
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:26:12
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:26:1a
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:26:1d
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:26:30
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:26:40
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:26:4b
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:26:67
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:26:88
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:26:b3
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:26:c9
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:26:d7
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:26:db
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:26:e5
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:36:17
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:36:33
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:36:3e
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:36:45
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:36:57
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:36:7d
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:36:8b
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:36:be
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:36:c4
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:36:ca
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:36:f1
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:36:f6
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:46:05
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:46:2d
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 1c:c1:de:7b:46:2f
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: 78:e7:d1:f7:09:93
-- :vlans:
- - 101
- :ifname: Gi0/48
- :mac: d4:85:64:69:20:82
-- :vlans:
- - 102
- :ifname: Gi0/48
- :ip: 172.18.160.253
- :mac: 6c:50:4d:28:8b:41
-- :vlans:
- - 540
- :ifname: Gi0/49
- :mac: 00:1b:ed:38:4f:00
-- :vlans:
- - 541
- :ifname: Gi0/49
- :mac: 00:17:5a:34:e6:79
-- :vlans:
- - 541
- :ifname: Gi0/49
- :ip: 192.168.69.2
- :mac: 00:19:a9:9f:48:c0
diff --git a/generators/input/sites/reims/net-links.yaml b/generators/input/sites/reims/net-links/sw-grid-a.yaml
similarity index 100%
rename from generators/input/sites/reims/net-links.yaml
rename to generators/input/sites/reims/net-links/sw-grid-a.yaml