Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 02bd6f05 authored by LELAURAIN Julien's avatar LELAURAIN Julien
Browse files

Merge branch 'roazhon4_network' into 'master' 

[rennes][network] Add swcore-01-rba switch and swdc-a035-[01-02] switches

See merge request !531
parents 304150d8 7aaac456
No related branches found
No related tags found
1 merge request!531[rennes][network] Add swcore-01-rba switch and swdc-a035-[01-02] switches
Pipeline #859213 passed
Stage: lint
Stage: validate
Stage: generate
Stage: deploy
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 471 additions and 3956 deletions
data/grid5000/sites/rennes/clusters/roazhon4/nodes/roazhon4-1.json
+ 2
− 2
View file @ 02bd6f05
......@@ -129,8 +129,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
"switch": null,
"switch_port": null,
"switch": "swdc-a035-01-rba",
"switch_port": "Eth103/1/10",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
......
data/grid5000/sites/rennes/network_equipments/gw.json
+ 2
− 2
View file @ 02bd6f05
......@@ -18,9 +18,9 @@
},
"lag3": {
"kind": "switch",
"port": "port-channel3",
"port": "port-channel286",
"rate": 20000000000,
"uid": "vss-inria"
"uid": "swcore-01-rba"
}
},
"ip": "172.17.111.211",
......
data/grid5000/sites/rennes/network_equipments/swcore-01-rba.json 0 → 100644
+ 74
− 0
View file @ 02bd6f05
{
"channels": {
"port-channel286": {
"kind": "router",
"port": "lag3",
"rate": 20000000000,
"uid": "gw"
},
"port-channel666": {
"kind": "switch",
"port": "port-channel666",
"rate": 20000000000,
"uid": "swdc-a035-01-rba"
},
"port-channel999": {
"kind": "switch",
"port": "port-channel999",
"rate": 20000000000,
"uid": "swdc-a035-02-rba"
}
},
"kind": "switch",
"linecards": [
{
},
{
"kavlan_pattern": "TenGigabitEthernet%LINECARD%/1/%PORT%",
"kind": "switch",
"ports": [
{
},
{
"kind": "channel",
"snmp_name": "TenGigabitEthernet1/1/1",
"uid": "port-channel666"
},
{
"kind": "channel",
"snmp_name": "TenGigabitEthernet1/1/2",
"uid": "port-channel999"
},
{
"kind": "channel",
"snmp_name": "TenGigabitEthernet1/1/3",
"uid": "port-channel666"
},
{
"kind": "channel",
"snmp_name": "TenGigabitEthernet1/1/4",
"uid": "port-channel999"
},
{
"kind": "channel",
"snmp_name": "TenGigabitEthernet1/1/5",
"uid": "port-channel286"
},
{
"kind": "channel",
"snmp_name": "TenGigabitEthernet1/1/6",
"uid": "port-channel286"
}
],
"rate": 10000000000,
"snmp_pattern": "TenGigabitEthernet%LINECARD%/1/%PORT%"
}
],
"managed_by_us": false,
"model": "Nexus 5596",
"site": "rennes",
"snmp_community": "none",
"type": "network_equipment",
"uid": "swcore-01-rba",
"warranty": "N/A"
}
\ No newline at end of file
data/grid5000/sites/rennes/network_equipments/swdc-a035-01-rba.json 0 → 100644
+ 280
− 0
View file @ 02bd6f05
{
"channels": {
"port-channel666": {
"kind": "switch",
"port": "port-channel666",
"rate": 20000000000,
"uid": "swcore-01-rba"
}
},
"kind": "switch",
"linecards": [
{
},
{
"kavlan_pattern": "Eth%LINECARD%/%PORT%",
"kind": "node",
"ports": [
{
},
{
"kind": "channel",
"snmp_name": "Eth1/1",
"uid": "port-channel666"
},
{
},
{
"kind": "channel",
"snmp_name": "Eth1/3",
"uid": "port-channel666"
}
],
"rate": 10000000000,
"snmp_pattern": "Eth%LINECARD%/%PORT%"
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
"kavlan_pattern": "Eth%LINECARD%/1/%PORT%",
"kind": "node",
"ports": [
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "Eth103/1/10",
"uid": "roazhon4-1"
}
],
"rate": 1000000000,
"snmp_pattern": "Eth%LINECARD%/1/%PORT%"
}
],
"managed_by_us": false,
"model": "Nexus 2000 FEX",
"site": "rennes",
"snmp_community": "none",
"type": "network_equipment",
"uid": "swdc-a035-01-rba",
"warranty": "N/A"
}
\ No newline at end of file
data/grid5000/sites/rennes/network_equipments/vss-inria.json deleted 100644 → 0
+ 0
− 2040
View file @ 304150d8
This diff is collapsed.
input/grid5000/sites/rennes/networks/gw-rennes.yaml
+ 2
− 2
View file @ 02bd6f05
......@@ -122,5 +122,5 @@ gw:
lag3:
kind: switch
rate: 20000000000
uid: vss-inria
port: port-channel3
uid: swcore-01-rba
port: port-channel286
input/grid5000/sites/rennes/networks/swcore-01-rba.yaml 0 → 100644
+ 49
− 0
View file @ 02bd6f05
---
swcore-01-rba:
model: Nexus 5596
warranty: N/A
kind: switch
managed_by_us: false
snmp_community: none
site: rennes
linecards:
1:
snmp_pattern: "TenGigabitEthernet%LINECARD%/1/%PORT%"
kavlan_pattern: "TenGigabitEthernet%LINECARD%/1/%PORT%"
rate: 10000000000
kind: switch
ports:
1:
uid: port-channel666
kind: channel
2:
uid: port-channel999
kind: channel
3:
uid: port-channel666
kind: channel
4:
uid: port-channel999
kind: channel
5:
uid: port-channel286
kind: channel
6:
uid: port-channel286
kind: channel
channels:
port-channel666:
uid: swdc-a035-01-rba
kind: switch
port: port-channel666
rate: 20000000000
port-channel999:
uid: swdc-a035-02-rba
kind: switch
port: port-channel999
rate: 20000000000
port-channel286:
uid: gw
kind: router
port: lag3
rate: 20000000000
input/grid5000/sites/rennes/networks/vss-inria.yaml → input/grid5000/sites/rennes/networks/swdc-a035-01-rba.yaml
+ 36
− 0
View file @ 02bd6f05
---
vss-inria:
model: Nexus 5596
swdc-a035-01-rba:
model: Nexus 2000 FEX
warranty: N/A
kind: switch
managed_by_us: false
......@@ -13,19 +13,24 @@ vss-inria:
rate: 10000000000
kind: node
ports:
997:
uid: port-channel3
1:
uid: port-channel666
kind: channel
998:
uid: port-channel3
3:
uid: port-channel666
kind: channel
999:
uid: swdc-a035-02-rba
kind: switch
port: 999
103:
snmp_pattern: "Eth%LINECARD%/1/%PORT%"
kavlan_pattern: "Eth%LINECARD%/1/%PORT%"
rate: 1000000000
kind: node
ports:
10:
uid: roazhon4-1
channels:
port-channel3:
uid: gw
kind: router
port: lag3
port-channel666:
uid: swcore-01-rba
kind: switch
port: port-channel666
rate: 20000000000
input/grid5000/sites/rennes/networks/swdc-a035-02-rba.yaml
+ 12
− 4
View file @ 02bd6f05
......@@ -13,11 +13,19 @@ swdc-a035-02-rba:
rate: 10000000000
kind: node
ports:
1:
uid: port-channel999
kind: channel
3:
uid: port-channel999
kind: channel
47:
uid: abacus25-1
48:
uid: abacus25-2
999:
uid: vss-inria
kind: switch
port: 999
channels:
port-channel999:
uid: swcore-01-rba
kind: switch
port: port-channel999
rate: 20000000000
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment