From 3b1eebcaf7c8272ca5459d915dbea99cdce1ac62 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Tue, 25 Mar 2025 09:56:21 +0100
Subject: [PATCH] [strasbourg][network] Correct typo
---
.../clusters/engelbourg/nodes/engelbourg-1.json | 4 ++--
.../sites/strasbourg/network_equipments/sw-admin.json | 9 ++++-----
.../sites/strasbourg/network_equipments/sw-core.json | 8 +++++---
input/grid5000/sites/strasbourg/networks/sw-core.yaml | 4 +++-
4 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
index 39fff66bc94..fe2c97163c5 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -56,8 +56,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-admin",
+ "switch_port": "Ethernet21",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
index 19ce0811c3b..2adf8ce2c04 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-admin.json
@@ -136,9 +136,9 @@
},
{
"kind": "node",
- "port": "core mgmt",
+ "port": "eth0",
"snmp_name": "Ethernet21",
- "uid": "sw"
+ "uid": "engelbourg-1"
},
{
"kind": "node",
@@ -229,10 +229,9 @@
{
},
{
- "kind": "node",
- "port": "core",
+ "kind": "switch",
"snmp_name": "Ethernet48",
- "uid": "sw"
+ "uid": "sw-core"
}
],
"rate": 1000000000,
diff --git a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
index fb2ad00fc3e..f7e9479217c 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/sw-core.json
@@ -1,4 +1,7 @@
{
+ "alias": [
+ "engelbourg-1"
+ ],
"channels": {
"port-channel1": {
"kind": "server",
@@ -229,10 +232,9 @@
"uid": "fleckenstein-10"
},
{
- "kind": "node",
- "port": "admin",
+ "kind": "switch",
"snmp_name": "Ethernet36",
- "uid": "sw"
+ "uid": "sw-admin"
},
{
},
diff --git a/input/grid5000/sites/strasbourg/networks/sw-core.yaml b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
index 3225ef553a4..82e22b7af23 100644
--- a/input/grid5000/sites/strasbourg/networks/sw-core.yaml
+++ b/input/grid5000/sites/strasbourg/networks/sw-core.yaml
@@ -7,6 +7,8 @@ sw-core:
kind: switch
managed_by_us: true
snmp_community: Unknown
+ alias:
+ - engelbourg-1
site: strasbourg
linecards:
1:
@@ -84,7 +86,7 @@ sw-core:
84:
88:
92:
- uid: engelbourg-6-eth0
+ uid: engelbourg-6-eth0
rate: 1000000000
96:
100:
--
GitLab