Skip to content

GitLab

Commit 9e302fe1 authored by Gaetan SIMO's avatar Gaetan SIMO
Browse files

Merge branch 'master' of ssh://git.grid5000.fr/srv/git/repos/reference-repository

parents f1b25ccb 1fae3b59
Hide whitespace changes
Inline Side-by-side
data/grid5000/sites/lyon/network_equipments/bettie.json
View file @ 9e302fe1
......@@ -158,7 +158,7 @@
},
{
"kind": "router",
"port": 19020,
"port": 317,
"uid": "gw"
}
],
......
data/grid5000/sites/lyon/network_equipments/chris.json
View file @ 9e302fe1
......@@ -156,27 +156,27 @@
},
{
"kind": "switch",
"port": "0:0",
"port": 0,
"uid": "yumi"
},
{
"kind": "switch",
"port": 8460,
"port": 141,
"uid": "pat"
},
{
"kind": "switch",
"port": 8520,
"port": 142,
"uid": "pat"
},
{
"kind": "switch",
"port": 8580,
"port": 143,
"uid": "pat"
},
{
"kind": "switch",
"port": 8640,
"port": 144,
"uid": "pat"
}
],
......
data/grid5000/sites/lyon/network_equipments/gw.json
View file @ 9e302fe1
......@@ -268,153 +268,7 @@
"kind": "node",
"naming_pattern": "%LINECARD%:%PORT%",
"ports": [
{
},
{
"uid": "capricorne-1"
},
{
"uid": "capricorne-2"
},
{
"uid": "capricorne-3"
},
{
"uid": "capricorne-4"
},
{
},
{
"uid": "capricorne-6"
},
{
"uid": "capricorne-7"
},
{
"uid": "capricorne-8"
},
{
"uid": "capricorne-9"
},
{
"uid": "capricorne-10"
},
{
"uid": "capricorne-11"
},
{
"uid": "capricorne-12"
},
{
"uid": "capricorne-13"
},
{
"uid": "capricorne-14"
},
{
"uid": "capricorne-15"
},
{
"uid": "capricorne-16"
},
{
"uid": "capricorne-17"
},
{
"uid": "capricorne-18"
},
{
"uid": "capricorne-19"
},
{
"uid": "capricorne-20"
},
{
"uid": "capricorne-21"
},
{
"uid": "capricorne-22"
},
{
"uid": "capricorne-23"
},
{
"uid": "capricorne-24"
},
{
"uid": "capricorne-25"
},
{
"uid": "capricorne-26"
},
{
"uid": "capricorne-27"
},
{
"uid": "capricorne-28"
},
{
"uid": "capricorne-29"
},
{
"uid": "capricorne-30"
},
{
"uid": "capricorne-31"
},
{
"uid": "capricorne-32"
},
{
"uid": "capricorne-33"
},
{
"uid": "capricorne-34"
},
{
"uid": "capricorne-35"
},
{
"uid": "capricorne-36"
},
{
"uid": "capricorne-37"
},
{
"uid": "capricorne-38"
},
{
"uid": "capricorne-39"
},
{
"uid": "capricorne-40"
},
{
"uid": "capricorne-41"
},
{
"uid": "capricorne-42"
},
{
"uid": "capricorne-43"
},
{
"uid": "capricorne-44"
},
{
"uid": "capricorne-45"
},
{
"uid": "capricorne-46"
},
{
"uid": "capricorne-47"
},
{
"uid": "capricorne-48"
}
],
"rate": 1000000000
},
......@@ -422,33 +276,7 @@
"kind": "node",
"naming_pattern": "%LINECARD%:%PORT%",
"ports": [
{
},
{
"uid": "capricorne-49"
},
{
"uid": "capricorne-50"
},
{
"uid": "capricorne-51"
},
{
"uid": "capricorne-52"
},
{
"uid": "capricorne-53"
},
{
"uid": "capricorne-54"
},
{
"uid": "capricorne-55"
},
{
"uid": "capricorne-56"
}
],
"rate": 1000000000
},
......@@ -460,11 +288,11 @@
},
{
"port": 3660,
"port": 61,
"uid": "venus"
},
{
"port": 3660,
"port": 61,
"uid": "salome"
},
{
......@@ -523,21 +351,21 @@
"uid": "coutoo"
},
{
"port": 3660,
"port": 61,
"uid": "pat"
},
{
"port": 6420,
"port": 107,
"rate": 100000000,
"uid": "zybline"
},
{
"port": 6480,
"port": 108,
"rate": 100000000,
"uid": "zybline"
},
{
"port": 6480,
"port": 108,
"rate": 100000000,
"uid": "bettie"
}
......
data/grid5000/sites/lyon/network_equipments/pat.json
View file @ 9e302fe1
......@@ -15,7 +15,7 @@
},
{
"port": 18840,
"port": 314,
"uid": "gw"
}
],
......@@ -93,22 +93,22 @@
},
{
"kind": "switch",
"port": 9900,
"port": 165,
"uid": "chris"
},
{
"kind": "switch",
"port": 9960,
"port": 166,
"uid": "chris"
},
{
"kind": "switch",
"port": 10020,
"port": 167,
"uid": "chris"
},
{
"kind": "switch",
"port": 10080,
"port": 168,
"uid": "chris"
}
],
......
data/grid5000/sites/lyon/network_equipments/yumi.json
View file @ 9e302fe1
......@@ -10,7 +10,7 @@
"ports": [
{
"kind": "switch",
"port": 9840,
"port": 164,
"uid": "chris"
}
],
......
data/grid5000/sites/lyon/network_equipments/zybline.json
View file @ 9e302fe1
......@@ -155,12 +155,12 @@
},
{
"kind": "router",
"port": 18900,
"port": 315,
"uid": "gw"
},
{
"kind": "router",
"port": 18960,
"port": 316,
"uid": "gw"
}
],
......
generators/input/sites/lyon/net-links/bettie.yaml 0 → 100644
View file @ 9e302fe1
---
bettie:
model: Cisco 2950
kind: switch
site: lyon
snmp_community: public
vlans:
naming_pattern: Vlan%VLANID%
routes: {}
linecards:
1:
naming_pattern: "Gi%LINECARD%/%PORT%"
kind: node
port: bmc
rate: 100000000
ports:
1: sagittaire-35
2: sagittaire-36
3: sagittaire-37
4: sagittaire-38
5: sagittaire-39
6: sagittaire-40
7: sagittaire-41
8: sagittaire-42
9: sagittaire-43
10: sagittaire-44
11: sagittaire-45
12: sagittaire-46
13: sagittaire-47
14: sagittaire-48
15: sagittaire-49
16: sagittaire-50
17: sagittaire-51
18: sagittaire-52
19: sagittaire-53
20: sagittaire-54
21: sagittaire-55
22: sagittaire-56
23: sagittaire-57
24: sagittaire-58
25: sagittaire-59
26: sagittaire-60
27: sagittaire-61
28: sagittaire-62
29: sagittaire-63
30: sagittaire-64
31: sagittaire-65
32: sagittaire-66
33: sagittaire-67
34: sagittaire-68
35: sagittaire-69
36: sagittaire-75
37: sagittaire-76
38: sagittaire-77
39: sagittaire-78
40: sagittaire-79
48:
uid: gw
kind: router
port: 5:17
channels:
naming_pattern: Po%CHANNELID%
generators/input/sites/lyon/net-links/chris.yaml 0 → 100644
View file @ 9e302fe1
---
chris:
model: Foundry
kind: switch
site: lyon
snmp_community: public
vlans:
naming_pattern: Vlan%VLANID%
routes: {}
linecards:
1:
naming_pattern: "%LINECARD%:%PORT%"
kind: router
rate: 1000000000
ports: {}
2:
naming_pattern: "%LINECARD%:%PORT%"
kind: node
rate: 100000000
port: bmc
ports:
1: capricorne-1
2: capricorne-2
3: capricorne-3
4: capricorne-4
5: capricorne-5
6: capricorne-6
7: capricorne-7
8: capricorne-8
9: capricorne-9
10: capricorne-10
11: capricorne-11
12: capricorne-12
13: capricorne-13
14: capricorne-14
15: capricorne-15
16: capricorne-16
17: capricorne-17
18: capricorne-18
19: capricorne-19
20: capricorne-20
21: capricorne-21
22: capricorne-22
23: capricorne-23
24: capricorne-24
25: capricorne-25
26: capricorne-26
27: capricorne-27
28: capricorne-28
29: capricorne-29
30: capricorne-30
31: capricorne-31
32: capricorne-32
33: capricorne-33
34: capricorne-34
35: capricorne-35
36: capricorne-36
37: capricorne-37
38: capricorne-38
39: capricorne-39
40: capricorne-40
41:
uid: nebula
kind: other
42:
uid: andromede
kind: other
44:
uid: yumi
kind: switch
port: 0:0
45:
uid: pat
kind: switch
port: 2:21
46:
uid: pat
kind: switch
port: 2:22
47:
uid: pat
kind: switch
port: 2:23
48:
uid: pat
kind: switch
port: 2:24
channels:
naming_pattern: Po%CHANNELID%
generators/input/sites/lyon/net-links.yaml → generators/input/sites/lyon/net-links/gw.yaml
View file @ 9e302fe1
......@@ -65,67 +65,12 @@ gw:
naming_pattern: "%LINECARD%:%PORT%"
kind: node
rate: 1000000000
ports:
10: capricorne-10
11: capricorne-11
12: capricorne-12
13: capricorne-13
14: capricorne-14
15: capricorne-15
16: capricorne-16
17: capricorne-17
18: capricorne-18
19: capricorne-19
1: capricorne-1
20: capricorne-20
21: capricorne-21
22: capricorne-22
23: capricorne-23
24: capricorne-24
25: capricorne-25
26: capricorne-26
27: capricorne-27
28: capricorne-28
29: capricorne-29
2: capricorne-2
30: capricorne-30
31: capricorne-31
32: capricorne-32
33: capricorne-33
34: capricorne-34
35: capricorne-35
36: capricorne-36
37: capricorne-37
38: capricorne-38
39: capricorne-39
3: capricorne-3
40: capricorne-40
41: capricorne-41
42: capricorne-42
43: capricorne-43
44: capricorne-44
45: capricorne-45
46: capricorne-46
47: capricorne-47
48: capricorne-48
4: capricorne-4
6: capricorne-6
7: capricorne-7
8: capricorne-8
9: capricorne-9
ports: {}
4:
naming_pattern: "%LINECARD%:%PORT%"
kind: node
rate: 1000000000
ports:
1: capricorne-49
2: capricorne-50
3: capricorne-51
4: capricorne-52
5: capricorne-53
6: capricorne-54
7: capricorne-55
8: capricorne-56
ports: {}
2:
naming_pattern: "%LINECARD%:%PORT%"
kind: node
......@@ -232,354 +177,3 @@ gw:
port: 1:48
channels:
naming_pattern: Po%CHANNELID%
venus:
model: Foundry FES-X 448
kind: switch
site: lyon
snmp_community: public
vlans:
naming_pattern: Vlan%VLANID%
routes: {}
linecards:
1:
naming_pattern: "%LINECARD%:%PORT%"
kind: router
rate: 1000000000
ports:
1: gw
2:
naming_pattern: "%LINECARD%:%PORT%"
kind: node
rate: 1000000000
ports: {}
channels:
naming_pattern: Po%CHANNELID%
salome:
model: Foundry FES-X 448
kind: switch
site: lyon
snmp_community: public
vlans:
naming_pattern: Vlan%VLANID%
routes: {}
linecards:
1:
naming_pattern: "%LINECARD%:%PORT%"
kind: router
rate: 1000000000
ports:
1: gw
2: