From 4fe6ee03aee135e3650a05a28840eea957026787 Mon Sep 17 00:00:00 2001
From: David Loup <david.loup@inria.fr>
Date: Thu, 29 Oct 2020 11:16:04 +0100
Subject: [PATCH] [lyon] Update network topology (link to admin switch)
---
data/grid5000/sites/lyon/network_equipments/gw.json | 3 +++
data/grid5000/sites/lyon/network_equipments/salome.json | 4 ----
input/grid5000/sites/lyon/networks/gw-lyon.yaml | 3 +++
input/grid5000/sites/lyon/networks/salome.yaml | 3 ---
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/data/grid5000/sites/lyon/network_equipments/gw.json b/data/grid5000/sites/lyon/network_equipments/gw.json
index 867531da5b..0f58011962 100644
--- a/data/grid5000/sites/lyon/network_equipments/gw.json
+++ b/data/grid5000/sites/lyon/network_equipments/gw.json
@@ -114,6 +114,9 @@
{
},
{
+ "kind": "other",
+ "snmp_name": "ethernet1/1/29",
+ "uid": "sw-admin"
},
{
"kind": "backbone",
diff --git a/data/grid5000/sites/lyon/network_equipments/salome.json b/data/grid5000/sites/lyon/network_equipments/salome.json
index 2211402fee..633f1a0f37 100644
--- a/data/grid5000/sites/lyon/network_equipments/salome.json
+++ b/data/grid5000/sites/lyon/network_equipments/salome.json
@@ -22,10 +22,6 @@
{
},
{
- "kind": "other",
- "port": "eth1",
- "snmp_name": "GigabitEthernet3",
- "uid": "sw-admin"
},
{
},
diff --git a/input/grid5000/sites/lyon/networks/gw-lyon.yaml b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
index 7dde8eb13d..a5a9270328 100644
--- a/input/grid5000/sites/lyon/networks/gw-lyon.yaml
+++ b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
@@ -109,6 +109,9 @@ gw:
uid: force10
kind: switch
port: '0:60'
+ 29:
+ uid: sw-admin
+ kind: other
30:
uid: renater-lyon
kind: backbone
diff --git a/input/grid5000/sites/lyon/networks/salome.yaml b/input/grid5000/sites/lyon/networks/salome.yaml
index e4a56eae90..e2bc58915d 100644
--- a/input/grid5000/sites/lyon/networks/salome.yaml
+++ b/input/grid5000/sites/lyon/networks/salome.yaml
@@ -36,9 +36,6 @@ salome:
uid: gw
kind: router
port: "0:24"
- 3:
- uid: sw-admin
- kind: other
21: sagittaire-1
22: sagittaire-2
23: sagittaire-3
--
GitLab