From a28629d1671d28b746c0c823bbc0cc759dc03ded Mon Sep 17 00:00:00 2001
From: Baptiste Jonglez <baptiste.jonglez@imag.fr>
Date: Thu, 3 Dec 2020 18:00:15 +0100
Subject: [PATCH] [grenoble] [network] Fix interface names for gw.grenoble
---
.../sites/grenoble/network_equipments/gw.json | 11 +++++++----
.../sites/grenoble/network_equipments/sw-aci-333.json | 2 +-
input/grid5000/sites/grenoble/networks/gw.yaml | 11 +++++++----
.../grid5000/sites/grenoble/networks/sw-aci-333.yaml | 2 +-
4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/data/grid5000/sites/grenoble/network_equipments/gw.json b/data/grid5000/sites/grenoble/network_equipments/gw.json
index fea929bcdf..7c61fd6606 100644
--- a/data/grid5000/sites/grenoble/network_equipments/gw.json
+++ b/data/grid5000/sites/grenoble/network_equipments/gw.json
@@ -5,7 +5,7 @@
],
"backplane_bps": 800000000000,
"channels": {
- "TN-G5K-INT": {
+ "ACI-G5K-INT": {
"kind": "switch",
"port": "TN-G5K-INT",
"rate": 30000000000,
@@ -275,17 +275,17 @@
{
"kind": "channel",
"snmp_name": "X670V-48x Port 43",
- "uid": "TN-G5K-INT"
+ "uid": "ACI-G5K-INT"
},
{
"kind": "channel",
"snmp_name": "X670V-48x Port 44",
- "uid": "TN-G5K-INT"
+ "uid": "ACI-G5K-INT"
},
{
"kind": "channel",
"snmp_name": "X670V-48x Port 45",
- "uid": "TN-G5K-INT"
+ "uid": "ACI-G5K-INT"
},
{
"kind": "server",
@@ -293,6 +293,9 @@
"uid": "digwatt"
},
{
+ "kind": "other",
+ "snmp_name": "X670V-48x Port 47",
+ "uid": "ACI-G5K-EXT"
},
{
"kind": "backbone",
diff --git a/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json b/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json
index bdafca8f85..e8d9a340f7 100644
--- a/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json
+++ b/data/grid5000/sites/grenoble/network_equipments/sw-aci-333.json
@@ -2,7 +2,7 @@
"channels": {
"TN-G5K-INT": {
"kind": "switch",
- "port": "TN-G5K-INT",
+ "port": "ACI-G5K-INT",
"rate": 30000000000,
"uid": "gw"
}
diff --git a/input/grid5000/sites/grenoble/networks/gw.yaml b/input/grid5000/sites/grenoble/networks/gw.yaml
index a1effd8a45..bfdae1b498 100644
--- a/input/grid5000/sites/grenoble/networks/gw.yaml
+++ b/input/grid5000/sites/grenoble/networks/gw.yaml
@@ -130,22 +130,25 @@ gw:
uid: dighyp2
kind: server
43:
- uid: TN-G5K-INT
+ uid: ACI-G5K-INT
kind: channel
44:
- uid: TN-G5K-INT
+ uid: ACI-G5K-INT
kind: channel
45:
- uid: TN-G5K-INT
+ uid: ACI-G5K-INT
kind: channel
46:
uid: digwatt
kind: server
+ 47:
+ uid: ACI-G5K-EXT
+ kind: other
48:
uid: renater5
kind: backbone
channels:
- TN-G5K-INT:
+ ACI-G5K-INT:
uid: sw-aci-333
port: TN-G5K-INT
kind: switch
diff --git a/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml b/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml
index 96ea135c22..e6eb0fea6a 100644
--- a/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml
+++ b/input/grid5000/sites/grenoble/networks/sw-aci-333.yaml
@@ -27,6 +27,6 @@ sw-aci-333:
channels:
TN-G5K-INT:
uid: gw
- port: TN-G5K-INT
+ port: ACI-G5K-INT
kind: switch
rate: 30000000000
--
GitLab