Skip to content

GitLab

Commit 78fe4957 authored by Sebastien Badia's avatar Sebastien Badia
Browse files

[network] Toulouse - Remove sgrapheneib,sgriffonib; Add stalc4 nodes; fix... 

[network] Toulouse - Remove sgrapheneib,sgriffonib; Add stalc4 nodes; fix ethernet hp5406zl linecard (Closes: #4840)
parent ead7bfe0
Hide whitespace changes
Inline Side-by-side
data/grid5000/sites/nancy/network_equipments/gw-nancy.json
View file @ 78fe4957
......@@ -15,85 +15,108 @@
},
{
"kind": "switch",
"kind": "other",
"uid": "sgrapheneib"
},
{
"kind": "other",
"port": "bmc",
"uid": "fgriffon2"
},
{
"kind": "virtual",
"port": "stalc1-ipmi",
"uid": "TALC-adm"
},
{
"kind": "switch",
"port": "stalc1",
"uid": "stalc1"
},
{
},
{
"kind": "switch",
"kind": "other",
"uid": "sgriffonib"
},
{
"uid": "grimoire"
},
{
"kind": "other",
"port": "eth0",
"uid": "grog"
},
{
"kind": "other",
"port": "eth1",
"uid": "grog"
},
{
"kind": "other",
"port": "bmc",
"uid": "fgriffon1"
},
{
"kind": "other",
"port": "eth0",
"uid": "fgriffon1"
},
{
"kind": "other",
"port": "eth0",
"uid": "fgrelon2"
},
{
"kind": "other",
"uid": "sgraphene1-ipmi"
},
{
"kind": "other",
"uid": "sgraphene2-ipmi"
},
{
"kind": "other",
"uid": "sgraphene3-ipmi"
},
{
"kind": "other",
"uid": "sgraphene4-ipmi"
},
{
"kind": "other",
"port": "eth1",
"uid": "fgrelon2"
},
{
"uid": "loria"
"kind": "virtual",
"uid": "LORIA"
},
{
"kind": "other",
"uid": "sgriffon2-ipmi"
},
{
"kind": "other",
"uid": "sgriffon1-ipmi"
},
{
"kind": "other",
"uid": "sgriffon3-ipmi"
},
{
"kind": "other",
"port": "eth0",
"uid": "fgrelon1"
},
{
"kind": "other",
"port": "eth1",
"uid": "fgriffon1"
},
{
"kind": "other",
"port": "eth1",
"uid": "fgrelon1"
}
......@@ -153,10 +176,12 @@
},
{
"kind": "other",
"port": "eth2",
"uid": "fgriffon1"
},
{
"kind": "other",
"port": "eth2",
"uid": "fgriffon2"
},
{
......
data/grid5000/sites/nancy/network_equipments/sgrapheneib.json deleted 100644 → 0
View file @ ead7bfe0
{
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
"kind": "switch",
"linecards": [
{
"kind": "router",
"naming_pattern": "%LINECARD%/%PORT%",
"ports": [
{
"uid": "gw-nancy"
}
],
"rate": 10000000000
}
],
"model": "Infiniband",
"routes": {
},
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgrapheneib",
"vlans": {
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
"use_cacti": "no"
}
}
\ No newline at end of file
data/grid5000/sites/nancy/network_equipments/sgriffonib.json deleted 100644 → 0
View file @ ead7bfe0
{
"channels": {
"naming_pattern": "Po%CHANNELID%"
},
"kind": "switch",
"linecards": [
{
"kind": "router",
"naming_pattern": "%LINECARD%/%PORT%",
"ports": [
{
"uid": "gw-nancy"
}
],
"rate": 10000000000
}
],
"model": "Infiniband",
"routes": {
},
"site": "nancy",
"snmp_community": "public",
"type": "network_equipment",
"uid": "sgriffonib",
"vlans": {
"naming_pattern": "Vlan%VLANID%"
},
"weathermap": {
"use_cacti": "no"
}
}
\ No newline at end of file
data/grid5000/sites/nancy/network_equipments/stalc1.json
View file @ 78fe4957
......@@ -171,6 +171,7 @@
},
{
"kind": "other",
"port": "eth2",
"rate": 10000000000,
"uid": "talc-srv"
}
......
data/grid5000/sites/nancy/network_equipments/stalc2.json
View file @ 78fe4957
......@@ -164,10 +164,14 @@
},
{
"uid": "talc1"
"kind": "other",
"port": "eth2",
"uid": "ftalc1"
},
{
"uid": "talc2"
"kind": "other",
"port": "eth2",
"uid": "ftalc2"
}
],
"rate": 10000000000
......
data/grid5000/sites/nancy/network_equipments/stalc4.json
View file @ 78fe4957
......@@ -5,7 +5,110 @@
"kind": "switch",
"linecards": [
{
"kind": "node",
"naming_pattern": "GigabitEthernet1/%LINECARD%/%PORT%",
"ports": [
{
},
{
"uid": "talc-105"
},
{
"uid": "talc-106"
},
{
"uid": "talc-107"
},
{
"uid": "talc-108"
},
{
"uid": "talc-109"
},
{
"uid": "talc-110"
},
{
"uid": "talc-111"
},
{
"uid": "talc-112"
},
{
"uid": "talc-113"
},
{
"uid": "talc-114"
},
{
"uid": "talc-115"
},
{
"uid": "talc-116"
},
{
"uid": "talc-117"
},
{
"uid": "talc-118"
},
{
"uid": "talc-119"
},
{
"uid": "talc-120"
},
{
"uid": "talc-121"
},
{
},
{
"uid": "talc-123"
},
{
"uid": "talc-124"
},
{
},
{
},
{
},
{
},
{
"uid": "talc-125"
},
{
"uid": "talc-126"
},
{
"uid": "talc-127"
},
{
"uid": "talc-128"
},
{
"uid": "talc-129"
},
{
"uid": "talc-130"
},
{
"uid": "talc-131"
},
{
"uid": "talc-132"
}
],
"rate": 1000000000
},
{
"kind": "switch",
......
generators/input/sites/nancy/net-links/gw-nancy.yaml
View file @ 78fe4957
---
gw-nancy:
---
gw-nancy:
model: HP Procurve 5406zl
kind: router
site: nancy
snmp_community: public
vlans:
vlans:
naming_pattern: Vlan%VLANID%
"100":
"100":
administrative: yes
addresses:
addresses:
- 172.16.79.254
routes: {}
linecards:
1:
linecards:
1:
naming_pattern: "%LINECARD:A%%PORT%"
kind: other
rate: 1000000000
ports:
1:
kind: switch
ports:
1:
kind: other
uid: sgrapheneib
2:
2:
port: bmc
uid: fgriffon2
3:
kind: other
3:
uid: TALC-adm
4:
port: stalc1-ipmi
kind: virtual
4:
kind: switch
uid: stalc1
6:
kind: switch
port: stalc1
6:
kind: other
uid: sgriffonib
7: grimoire
8:
8:
port: eth0
uid: grog
9:
kind: other
9:
port: eth1
uid: grog
10:
kind: other
10:
port: bmc
kind: other
uid: fgriffon1
11:
11:
port: eth0
uid: fgriffon1
13:
kind: other
12:
port: eth0
uid: fgrelon2
kind: other
13:
uid: sgraphene1-ipmi
14:
kind: other
14:
uid: sgraphene2-ipmi
15:
kind: other
15:
uid: sgraphene3-ipmi
16:
kind: other
16:
uid: sgraphene4-ipmi
18:
uid: loria
19:
kind: other
17:
port: eth1
uid: fgrelon2
kind: other
18:
uid: LORIA
kind: virtual
19:
uid: sgriffon2-ipmi
20:
kind: other
20:
uid: sgriffon1-ipmi
21:
kind: other
21:
uid: sgriffon3-ipmi
22:
kind: other
22:
port: eth0
kind: other
uid: fgrelon1
23:
23:
port: eth1
uid: fgriffon1
24:
kind: other
24:
port: eth1
kind: other
uid: fgrelon1
2:
2:
naming_pattern: "%LINECARD:A%%PORT%"
kind: switch
rate: 1000000000
ports:
ports:
3: sgraphene3
4: sgriffon2
3:
3:
naming_pattern: "%LINECARD:A%%PORT%"
kind: switch
rate: 1000000000
ports:
ports:
1: sgraphene1
2: sgraphene2
4: sgraphene4
4:
4:
naming_pattern: "%LINECARD:A%%PORT%"
kind: switch
rate: 1000000000
ports:
1:
ports:
1:
kind: other
uid: fgriffon1
2:
port: eth2
2:
kind: other
uid: fgriffon2
3:
port: eth2
3:
uid: sgriffon3
4:
4:
uid: sgriffon1
5:
5:
naming_pattern: "%LINECARD:A%%PORT%"
kind: virtual
rate: 10000000000
ports:
ports:
4: renater-nancy
channels:
channels:
naming_pattern: Po%CHANNELID%
generators/input/sites/nancy/net-links/sgrapheneib.yaml deleted 100644 → 0
View file @ ead7bfe0
---
sgrapheneib:
model: Infiniband
kind: switch
site: nancy
snmp_community: public
weathermap:
use_cacti: "no"
vlans:
naming_pattern: Vlan%VLANID%
routes: {}
linecards:
0:
naming_pattern: "%LINECARD%/%PORT%"
kind: router
rate: 10000000000
ports:
0: gw-nancy
channels:
naming_pattern: Po%CHANNELID%
generators/input/sites/nancy/net-links/sgriffonib.yaml deleted 100644 → 0
View file @ ead7bfe0
---
sgriffonib:
model: Infiniband
kind: switch
site: nancy
snmp_community: public
weathermap:
use_cacti: "no"
vlans:
naming_pattern: Vlan%VLANID%
routes: {}
linecards:
0:
naming_pattern: "%LINECARD%/%PORT%"
kind: router
rate: 10000000000
ports:
0: gw-nancy
channels:
naming_pattern: Po%CHANNELID%
generators/input/sites/nancy/net-links/stalc1.yaml
View file @ 78fe4957
---
stalc1:
---
stalc1:
model: 3com 4500G
kind: switch
site: nancy
snmp_community: public
vlans:
vlans:
naming_pattern: Vlan-interface%VLANID%
"1":
"1":
administrative: yes
addresses:
addresses:
- 172.16.79.224
routes: {}
linecards:
0:
linecards:
0:
naming_pattern: "GigabitEthernet1/%LINECARD%/%PORT%"
kind: node
rate: 1000000000
ports:
ports:
1: talc-1
3: talc-2
5: talc-134
......@@ -56,22 +56,23 @@ stalc1:
41: talc-35
42: talc-36
43: talc-37
1:
1:
naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
kind: switch
rate: 10000000000
ports:
ports:
2: stalc3
2: