From 4d5414f106688aa0ec408fbd92c889a74cb12453 Mon Sep 17 00:00:00 2001
From: PARISOT Clement <clement.parisot@inria.fr>
Date: Wed, 12 Feb 2025 18:11:11 +0100
Subject: [PATCH] [grenoble] network - Fix port-channel1 name on skinovis2
---
.../sites/grenoble/network_equipments/gw.json | 10 +++++++++-
.../network_equipments/skinovis2-prod-01.json | 6 +++---
.../sites/grenoble/networks/gw-grenoble.yaml | 12 +++++++++++-
.../sites/grenoble/networks/skinovis2-prod-01.yaml | 6 +++---
4 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json
index 8edfca1af93..a1a76a3d9d1 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw.json
@@ -31,7 +31,7 @@
},
"port-channel40": {
"kind": "switch",
- "port": "Po1",
+ "port": "port-channel1",
"rate": 20000000000,
"uid": "skinovis2-prod-01"
},
@@ -341,8 +341,16 @@
"uid": "drac-12"
},
{
+ "kind": "channel",
+ "rate": 10000000000,
+ "snmp_name": "ethernet1/1/49",
+ "uid": "port-channel40"
},
{
+ "kind": "channel",
+ "rate": 10000000000,
+ "snmp_name": "ethernet1/1/50",
+ "uid": "port-channel40"
},
{
},
diff --git a/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json
index 20d36ef2040..b46a0c84fcc 100644
--- a/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/skinovis2-prod-01.json
@@ -1,7 +1,7 @@
{
"backplane_bps": 400000000000,
"channels": {
- "Po1": {
+ "port-channel1": {
"kind": "router",
"port": "port-channel40",
"rate": 20000000000,
@@ -192,12 +192,12 @@
{
"kind": "channel",
"snmp_name": "Ethernet1/83",
- "uid": "Po1"
+ "uid": "port-channel1"
},
{
"kind": "channel",
"snmp_name": "Ethernet1/84",
- "uid": "Po1"
+ "uid": "port-channel1"
},
{
},
diff --git a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
index 8dcded0c08a..6428071c198 100644
--- a/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw-grenoble.yaml
@@ -168,6 +168,16 @@ gw:
46: drac-10
47: drac-11
48: drac-12
+ 49:
+ uid: port-channel40
+ kind: channel
+ rate: 10_000_000_000
+ snmp_pattern: "ethernet1/1/%PORT%"
+ 50:
+ uid: port-channel40
+ kind: channel
+ rate: 10_000_000_000
+ snmp_pattern: "ethernet1/1/%PORT%"
67:
uid: port-channel50
kind: channel
@@ -301,7 +311,7 @@ gw:
rate: 20000000000
port-channel40:
uid: skinovis2-prod-01
- port: Po1
+ port: port-channel1
kind: switch
rate: 20_000_000_000
port-channel100:
diff --git a/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml b/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml
index 8eda0ec0572..8b6bbe44417 100644
--- a/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/skinovis2-prod-01.yaml
@@ -23,17 +23,17 @@ skinovis2-prod-01:
rate: 1_000_000_000
trunk: false
83:
- uid: Po1
+ uid: port-channel1
kind: channel
84:
- uid: Po1
+ uid: port-channel1
kind: channel
107:
uid: srv-data3
kind: server
rate: 100_000_000_000
channels:
- Po1:
+ port-channel1:
kind: router
rate: 20_000_000_000
uid: gw
--
GitLab