Maj terminée. Pour consulter la release notes associée voici le lien :
https://about.gitlab.com/releases/2021/07/07/critical-security-release-gitlab-14-0-4-released/

Commit cf606944 authored by Gaetan SIMO's avatar Gaetan SIMO
Browse files

[reims] Adding network api

parent a7ee5f56
......@@ -2,163 +2,149 @@
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
"kind": "switch",
"kind": "router",
"linecards": [
{
"kind": "switch",
"kind": "node",
"naming_pattern": "Gi%LINECARD%/%PORT%",
"ports": [
{
},
{
"uid": "stremi-1"
},
{
"uid": "stremi-2"
},
{
"uid": "stremi-3"
},
{
"uid": "stremi-4"
},
{
"uid": "stremi-5"
},
{
"uid": "stremi-6"
},
{
"uid": "stremi-7"
},
{
"uid": "stremi-8"
},
{
"uid": "stremi-9"
},
{
"uid": "stremi-10"
},
{
"uid": "stremi-11"
},
{
"uid": "stremi-12"
},
{
"uid": "stremi-13"
},
{
"uid": "stremi-14"
},
{
"uid": "stremi-15"
},
{
"uid": "stremi-16"
},
{
"uid": "stremi-17"
},
{
"uid": "stremi-18"
},
{
"uid": "stremi-19"
},
{
"uid": "stremi-20"
},
{
"uid": "stremi-21"
},
{
"uid": "stremi-22"
},
{
"uid": "stremi-23"
},
{
"uid": "stremi-24"
},
{
"uid": "stremi-25"
},
{
"uid": "stremi-26"
},
{
"uid": "stremi-27"
},
{
"uid": "stremi-28"
},
{
"uid": "stremi-29"
},
{
"uid": "stremi-30"
},
{
"uid": "stremi-31"
},
{
"uid": "stremi-32"
},
{
"uid": "stremi-34"
},
{
"uid": "stremi-33"
},
{
"uid": "stremi-35"
},
{
"uid": "stremi-36"
},
{
"uid": "stremi-37"
},
{
"uid": "stremi-38"
},
{
},
{
},
{
},
{
},
{
"uid": "stremi-39"
},
{
"uid": "sw-admin4"
"uid": "stremi-40"
},
{
"uid": "sw-admin3"
"uid": "stremi-41"
},
{
"uid": "sw-admin2"
"uid": "stremi-42"
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
"uid": "stremi-43"
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
"uid": "stremi-44"
}
],
"rate": 1000000
"rate": 1000
}
],
"model": "cisco",
......
{
<<<<<<< HEAD
"description": "",
"email_contact": "reims-staff@lists.grid5000.fr",
"latitude": 49.244508,
"location": "Reims, France",
"longitude": 4.062714,
"name": "Reims",
"security_contact": "reims-staff@lists.grid5000.fr",
"sys_admin_contact": "reims-staff@lists.grid5000.fr",
"type": "site",
"uid": "reims",
"user_support_contact": "reims-staff@lists.grid5000.fr",
"web": ""
=======
"type": "site",
"uid": "reims"
>>>>>>> [network_equipments] adding sophia's network equipments + adding parameter :site on each equipment
}
\ No newline at end of file
---
gw:
model: cisco
kind: switch
kind: router
site: reims
snmp_community: public
routes: {}
vlans:
naming_pattern: Vlan%VLANID%
routes: {}
linecards:
0:
kind: switch
naming_pattern: Gi%LINECARD%/%PORT%
rate: 1000000
kind: node
rate: 1000
ports:
44: sw-admin4
45: sw-admin3
46: sw-admin2
47:
kind: router
uid: gw-lille-6k.grid5000.fr
48:
kind: router
uid: gw-lille-6k.grid5000.fr
1: stremi-1
2: stremi-2
3: stremi-3
4: stremi-4
5: stremi-5
6: stremi-6
7: stremi-7
8: stremi-8
9: stremi-9
10: stremi-10
11: stremi-11
12: stremi-12
13: stremi-13
14: stremi-14
15: stremi-15
16: stremi-16
17: stremi-17
18: stremi-18
19: stremi-19
20: stremi-20
21: stremi-21
22: stremi-22
23: stremi-23
24: stremi-24
25: stremi-25
26: stremi-26
27: stremi-27
28: stremi-28
29: stremi-29
30: stremi-30
31: stremi-31
32: stremi-32
34: stremi-33
33: stremi-34
35: stremi-35
36: stremi-36
37: stremi-37
38: stremi-38
39: stremi-39
40: stremi-40
41: stremi-41
42: stremi-42
43: stremi-43
44: stremi-44
channels:
naming_pattern: Po%CHANNELID%
---
- :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: