Mentions légales du service

Skip to content
Snippets Groups Projects
Commit a38dfdf1 authored by IMBERT Matthieu's avatar IMBERT Matthieu
Browse files

Revert "[rennes, toulouse] fix aruba trunks naming lagX -> lag X" 

This reverts commit 936c4ec4.
parent 8bf2cd77
Branches
No related tags found
1 merge request!762Fix #15882
Hide whitespace changes
Inline Side-by-side
Showing
with 54 additions and 54 deletions
data/grid5000/sites/rennes/network_equipments/gw.json
+ 15
− 15
View file @ a38dfdf1
......@@ -4,27 +4,27 @@
],
"backplane_bps": 1440000000000,
"channels": {
"lag 1": {
"lag1": {
"kind": "switch",
"port": "lag 1",
"port": "lag1",
"rate": 200000000000,
"uid": "sw-1"
},
"lag 2": {
"lag2": {
"kind": "server",
"port": "lag 2",
"port": "lag2",
"rate": 50000000000,
"uid": "srv-data"
},
"lag 3": {
"lag3": {
"kind": "switch",
"port": "port-channel286",
"rate": 20000000000,
"uid": "swcore-01-rba"
},
"lag 4": {
"lag4": {
"kind": "server",
"port": "lag 4",
"port": "lag4",
"rate": 50000000000,
"uid": "srv-data2"
}
......@@ -99,12 +99,12 @@
{
"kind": "channel",
"snmp_name": "1/1/29",
"uid": "lag 4"
"uid": "lag4"
},
{
"kind": "channel",
"snmp_name": "1/1/30",
"uid": "lag 4"
"uid": "lag4"
},
{
"kind": "server",
......@@ -126,12 +126,12 @@
{
"kind": "channel",
"snmp_name": "1/1/35",
"uid": "lag 2"
"uid": "lag2"
},
{
"kind": "channel",
"snmp_name": "1/1/36",
"uid": "lag 2"
"uid": "lag2"
},
{
},
......@@ -174,25 +174,25 @@
"kind": "channel",
"rate": 10000000000,
"snmp_name": "1/1/47",
"uid": "lag 3"
"uid": "lag3"
},
{
"kind": "channel",
"rate": 10000000000,
"snmp_name": "1/1/48",
"uid": "lag 3"
"uid": "lag3"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/49",
"uid": "lag 1"
"uid": "lag1"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/50",
"uid": "lag 1"
"uid": "lag1"
}
],
"rate": 25000000000,
......
data/grid5000/sites/rennes/network_equipments/sw-1.json
+ 4
− 4
View file @ a38dfdf1
{
"backplane_bps": 1440000000000,
"channels": {
"lag 1": {
"lag1": {
"kind": "switch",
"port": "lag 1",
"port": "lag1",
"rate": 200000000000,
"uid": "gw"
}
......@@ -247,13 +247,13 @@
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/49",
"uid": "lag 1"
"uid": "lag1"
},
{
"kind": "channel",
"rate": 100000000000,
"snmp_name": "1/1/50",
"uid": "lag 1"
"uid": "lag1"
}
],
"rate": 25000000000,
......
data/grid5000/sites/rennes/network_equipments/swcore-01-rba.json
+ 1
− 1
View file @ a38dfdf1
......@@ -2,7 +2,7 @@
"channels": {
"port-channel286": {
"kind": "router",
"port": "lag 3",
"port": "lag3",
"rate": 20000000000,
"uid": "gw"
},
......
data/grid5000/sites/toulouse/network_equipments/gw.json
+ 6
− 6
View file @ a38dfdf1
......@@ -3,13 +3,13 @@
"gw-toulouse"
],
"channels": {
"lag 1": {
"lag1": {
"kind": "server",
"port": "port-channel1",
"rate": 20000000000,
"uid": "nfs"
},
"lag 2": {
"lag2": {
"kind": "switch",
"port": "lacp key 1",
"rate": 20000000000,
......@@ -99,12 +99,12 @@
{
"kind": "channel",
"snmp_name": "1/1/15",
"uid": "lag 2"
"uid": "lag2"
},
{
"kind": "channel",
"snmp_name": "1/1/16",
"uid": "lag 2"
"uid": "lag2"
},
{
"kind": "server",
......@@ -119,12 +119,12 @@
{
"kind": "channel",
"snmp_name": "1/1/19",
"uid": "lag 1"
"uid": "lag1"
},
{
"kind": "channel",
"snmp_name": "1/1/20",
"uid": "lag 1"
"uid": "lag1"
}
],
"rate": 10000000000,
......
data/grid5000/sites/toulouse/network_equipments/sw-estats.json
+ 1
− 1
View file @ a38dfdf1
......@@ -5,7 +5,7 @@
"channels": {
"lacp key 1": {
"kind": "router",
"port": "lag 2",
"port": "lag2",
"rate": 20000000000,
"uid": "gw"
}
......
input/grid5000/sites/rennes/networks/gw-rennes.yaml
+ 15
− 15
View file @ a38dfdf1
......@@ -70,10 +70,10 @@ gw:
rate: 25000000000
ports:
29:
uid: lag 4
uid: lag4
kind: channel
30:
uid: lag 4
uid: lag4
kind: channel
31:
uid: srv-1
......@@ -85,10 +85,10 @@ gw:
uid: srv-3
kind: server
35:
uid: lag 2
uid: lag2
kind: channel
36:
uid: lag 2
uid: lag2
kind: channel
43:
uid: sw-adm-1
......@@ -108,39 +108,39 @@ gw:
kind: backbone
rate: 10000000000
47:
uid: lag 3
uid: lag3
kind: channel
rate: 10000000000
48:
uid: lag 3
uid: lag3
kind: channel
rate: 10000000000
49:
uid: lag 1
uid: lag1
kind: channel
rate: 100000000000
50:
uid: lag 1
uid: lag1
kind: channel
rate: 100000000000
channels:
lag 1:
lag1:
kind: switch
rate: 200000000000
uid: sw-1
port: lag 1
lag 2:
port: lag1
lag2:
kind: server
rate: 50000000000
uid: srv-data
port: lag 2
lag 3:
port: lag2
lag3:
kind: switch
rate: 20000000000
uid: swcore-01-rba
port: port-channel286
lag 4:
lag4:
kind: server
rate: 50000000000
uid: srv-data2
port: lag 4
port: lag4
input/grid5000/sites/rennes/networks/sw-1.yaml
+ 4
− 4
View file @ a38dfdf1
......@@ -80,16 +80,16 @@ sw-1:
32:
uid: paradoxe-32
49:
uid: lag 1
uid: lag1
kind: channel
rate: 100000000000
50:
uid: lag 1
uid: lag1
kind: channel
rate: 100000000000
channels:
lag 1:
lag1:
kind: switch
rate: 200000000000
uid: gw
port: lag 1
port: lag1
input/grid5000/sites/rennes/networks/swcore-01-rba.yaml
+ 1
− 1
View file @ a38dfdf1
......@@ -51,5 +51,5 @@ swcore-01-rba:
port-channel286:
uid: gw
kind: router
port: lag 3
port: lag3
rate: 20000000000
input/grid5000/sites/toulouse/networks/gw.yaml
+ 6
− 6
View file @ a38dfdf1
......@@ -79,10 +79,10 @@ gw:
9: montcalm-9
10: montcalm-10
15:
uid: lag 2
uid: lag2
kind: channel
16:
uid: lag 2
uid: lag2
kind: channel
17:
uid: pve-1
......@@ -91,18 +91,18 @@ gw:
uid: pve-2
kind: server
19:
uid: lag 1
uid: lag1
kind: channel
20:
uid: lag 1
uid: lag1
kind: channel
channels:
lag 1:
lag1:
uid: nfs
kind: server
rate: 20000000000
port: port-channel1
lag 2:
lag2:
uid: sw-estats
kind: switch
rate: 20000000000
......
input/grid5000/sites/toulouse/networks/sw-estats.yaml
+ 1
− 1
View file @ a38dfdf1
......@@ -43,4 +43,4 @@ sw-estats:
uid: gw
kind: router
rate: 20000000000
port: lag 2
port: lag2
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment