From a7384c9d23355fae21ff08144ad8b405426e2016 Mon Sep 17 00:00:00 2001
From: Pierre Jacquot <pierre.jacquot@inria.fr>
Date: Tue, 19 Sep 2023 18:04:23 +0200
Subject: [PATCH] [toulouse][network] Fix gw LAG description.
---
.../sites/toulouse/network_equipments/gw.json | 12 ++++++------
.../sites/toulouse/network_equipments/sw-estats.json | 2 +-
input/grid5000/sites/toulouse/networks/gw.yaml | 12 ++++++------
.../grid5000/sites/toulouse/networks/sw-estats.yaml | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/data/grid5000/sites/toulouse/network_equipments/gw.json b/data/grid5000/sites/toulouse/network_equipments/gw.json
index aff057009bf..888fca10c26 100644
--- a/data/grid5000/sites/toulouse/network_equipments/gw.json
+++ b/data/grid5000/sites/toulouse/network_equipments/gw.json
@@ -3,13 +3,13 @@
"gw-toulouse"
],
"channels": {
- "port-channel1": {
+ "lag1": {
"kind": "server",
"port": "port-channel1",
"rate": 20000000000,
"uid": "nfs"
},
- "port-channel2": {
+ "lag2": {
"kind": "switch",
"port": "port-channel1",
"rate": 20000000000,
@@ -98,12 +98,12 @@
{
"kind": "channel",
"snmp_name": "1/1/15",
- "uid": "port-channel2"
+ "uid": "lag2"
},
{
"kind": "channel",
"snmp_name": "1/1/16",
- "uid": "port-channel2"
+ "uid": "lag2"
},
{
"kind": "server",
@@ -118,12 +118,12 @@
{
"kind": "channel",
"snmp_name": "1/1/19",
- "uid": "port-channel1"
+ "uid": "lag1"
},
{
"kind": "channel",
"snmp_name": "1/1/20",
- "uid": "port-channel1"
+ "uid": "lag1"
}
],
"rate": 10000000000,
diff --git a/data/grid5000/sites/toulouse/network_equipments/sw-estats.json b/data/grid5000/sites/toulouse/network_equipments/sw-estats.json
index ba032581818..a97cb0fe478 100644
--- a/data/grid5000/sites/toulouse/network_equipments/sw-estats.json
+++ b/data/grid5000/sites/toulouse/network_equipments/sw-estats.json
@@ -5,7 +5,7 @@
"channels": {
"port-channel1": {
"kind": "router",
- "port": "port-channel2",
+ "port": "lag2",
"rate": 20000000000,
"uid": "gw"
}
diff --git a/input/grid5000/sites/toulouse/networks/gw.yaml b/input/grid5000/sites/toulouse/networks/gw.yaml
index 8f218e9836d..867601d3d1e 100644
--- a/input/grid5000/sites/toulouse/networks/gw.yaml
+++ b/input/grid5000/sites/toulouse/networks/gw.yaml
@@ -81,10 +81,10 @@ gw:
uid: montcalm-10
kind: server
15:
- uid: port-channel2
+ uid: lag2
kind: channel
16:
- uid: port-channel2
+ uid: lag2
kind: channel
17:
uid: pve-1
@@ -93,18 +93,18 @@ gw:
uid: pve-2
kind: server
19:
- uid: port-channel1
+ uid: lag1
kind: channel
20:
- uid: port-channel1
+ uid: lag1
kind: channel
channels:
- port-channel1:
+ lag1:
uid: nfs
kind: server
rate: 20000000000
port: port-channel1
- port-channel2:
+ lag2:
uid: sw-estats
kind: switch
rate: 20000000000
diff --git a/input/grid5000/sites/toulouse/networks/sw-estats.yaml b/input/grid5000/sites/toulouse/networks/sw-estats.yaml
index cc71d708903..f233825f5d3 100644
--- a/input/grid5000/sites/toulouse/networks/sw-estats.yaml
+++ b/input/grid5000/sites/toulouse/networks/sw-estats.yaml
@@ -39,4 +39,4 @@ sw-estats:
uid: gw
kind: router
rate: 20000000000
- port: port-channel2
+ port: lag2
--
GitLab