Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 5da51b76 authored by REGAL-MEZIN Colin's avatar REGAL-MEZIN Colin
Browse files

[strasbourg][network] Remove engelbourg from sw-core and update sw-admin description

parent 1af78808
No related branches found
No related tags found
1 merge request!1227Merge engelbourg into master
Hide whitespace changes
Inline Side-by-side
data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
+ 28
− 16
View file @ 5da51b76
......@@ -74,44 +74,52 @@
"uid": "fleckenstein-10-bmc"
},
{
"kind": "other",
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet13",
"uid": "engelbourg-2-bmc"
"uid": "engelbourg-2"
},
{
"kind": "other",
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet14",
"uid": "engelbourg-3-bmc"
"uid": "engelbourg-3"
},
{
"kind": "other",
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet15",
"uid": "engelbourg-4-bmc"
"uid": "engelbourg-4"
},
{
"kind": "other",
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet16",
"uid": "engelbourg-5-bmc"
"uid": "engelbourg-5"
},
{
"kind": "other",
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet17",
"uid": "engelbourg-6-bmc"
"uid": "engelbourg-6"
},
{
"kind": "other",
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet18",
"uid": "engelbourg-7-bmc"
"uid": "engelbourg-7"
},
{
"kind": "other",
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet19",
"uid": "engelbourg-8-bmc"
"uid": "engelbourg-8"
},
{
"kind": "other",
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet20",
"uid": "ramstein-1-bmc"
"uid": "ramstein-1"
},
{
"kind": "other",
......@@ -164,6 +172,10 @@
"uid": "iotlab-www-bmc"
},
{
"kind": "node",
"port": "eth0",
"snmp_name": "Ethernet31",
"uid": "engelbourg-1"
},
{
},
......
data/grid5000/sites/strasbourg/network_equipments/sw-core.json
+ 3
− 35
View file @ 5da51b76
......@@ -42,6 +42,9 @@
{
},
{
"kind": "router",
"snmp_name": "Ethernet5",
"uid": "gw"
},
{
"kind": "node",
......@@ -203,11 +206,6 @@
{
},
{
"kind": "node",
"port": "eth0",
"rate": 1000000000,
"snmp_name": "Ethernet44",
"uid": "engelbourg-2"
},
{
},
......@@ -232,11 +230,6 @@
{
},
{
"kind": "node",
"port": "eth0",
"rate": 1000000000,
"snmp_name": "Ethernet56",
"uid": "engelbourg-3"
},
{
},
......@@ -261,11 +254,6 @@
{
},
{
"kind": "node",
"port": "eth0",
"rate": 1000000000,
"snmp_name": "Ethernet68",
"uid": "engelbourg-4"
},
{
},
......@@ -290,11 +278,6 @@
{
},
{
"kind": "node",
"port": "eth0",
"rate": 1000000000,
"snmp_name": "Ethernet80",
"uid": "engelbourg-5"
},
{
},
......@@ -319,11 +302,6 @@
{
},
{
"kind": "node",
"port": "eth0",
"rate": 1000000000,
"snmp_name": "Ethernet92",
"uid": "engelbourg-6"
},
{
},
......@@ -348,11 +326,6 @@
{
},
{
"kind": "node",
"port": "eth0",
"rate": 1000000000,
"snmp_name": "Ethernet104",
"uid": "engelbourg-7"
},
{
},
......@@ -377,11 +350,6 @@
{
},
{
"kind": "node",
"port": "eth0",
"rate": 1000000000,
"snmp_name": "Ethernet116",
"uid": "engelbourg-8"
},
{
},
......
input/grid5000/sites/strasbourg/networks/sw-admin.yaml
+ 27
− 8
View file @ 5da51b76
......@@ -26,14 +26,30 @@ sw-admin:
10: fleckenstein-8-bmc
11: fleckenstein-9-bmc
12: fleckenstein-10-bmc
13: engelbourg-2-bmc
14: engelbourg-3-bmc
15: engelbourg-4-bmc
16: engelbourg-5-bmc
17: engelbourg-6-bmc
18: engelbourg-7-bmc
19: engelbourg-8-bmc
20: ramstein-1-bmc
13:
uid: engelbourg-2
kind: node
14:
uid: engelbourg-3
kind: node
15:
uid: engelbourg-4
kind: node
16:
uid: engelbourg-5
kind: node
17:
uid: engelbourg-6
kind: node
18:
uid: engelbourg-7
kind: node
19:
uid: engelbourg-8
kind: node
20:
uid: ramstein-1
kind: node
21: sw-core-mgmt
22: iotlab-devstrasbourg-bmc
23: inetlab-devaportnet-bmc
......@@ -44,6 +60,9 @@ sw-admin:
28: iotlab-strasbourg-bmc
29: iotlab-devwww-bmc
30: iotlab-www-bmc
31:
uid: engelbourg-1 # Fake entry
kind: node
48:
uid: sw-core
kind: switch
input/grid5000/sites/strasbourg/networks/sw-core.yaml
+ 4
− 15
View file @ 5da51b76
......@@ -30,7 +30,9 @@ sw-core:
uid: pve-2
kind: server
# 4: inetlab-sw1-eth0
# 5: inetlab-sw1-eth1
5:
uid: gw
kind: router
6: fleckenstein-1-eth0
# 7: fleckenstein-1-eth1
8: fleckenstein-1-eth2
......@@ -66,40 +68,27 @@ sw-core:
kind: switch
# 40: ramstein-1
44:
uid: engelbourg-2-eth0
rate: 1000000000
48:
52:
56:
uid: engelbourg-3-eth0
rate: 1000000000
60:
64:
68:
uid: engelbourg-4-eth0
rate: 1000000000
72:
76:
80:
uid: engelbourg-5-eth0
rate: 1000000000
84:
88:
92:
uid: engelbourg-6-eth0
rate: 1000000000
96:
100:
104:
uid: engelbourg-7-eth0
rate: 1000000000
108:
112:
116:
uid: engelbourg-8-eth0
rate: 1000000000
120:
124:
channels:
port-channel1:
port: port-channel1
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment