From ef23d2541e6fe246d2adc26051d8725349572d79 Mon Sep 17 00:00:00 2001
From: David Loup <david.loup@inria.fr>
Date: Wed, 3 Jun 2020 16:30:51 +0200
Subject: [PATCH] [lyon] Update network description between gw and salome
---
data/grid5000/sites/lyon/network_equipments/gw.json | 8 ++++----
.../grid5000/sites/lyon/network_equipments/salome.json | 10 +++++-----
input/grid5000/sites/lyon/networks/gw-lyon.yaml | 4 ++--
input/grid5000/sites/lyon/networks/salome.yaml | 6 +++---
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/data/grid5000/sites/lyon/network_equipments/gw.json b/data/grid5000/sites/lyon/network_equipments/gw.json
index 56f95950030..91c882bab47 100644
--- a/data/grid5000/sites/lyon/network_equipments/gw.json
+++ b/data/grid5000/sites/lyon/network_equipments/gw.json
@@ -94,12 +94,12 @@
"uid": "alcor"
},
{
- "kind": "switch",
- "port": "2",
- "snmp_name": "ethernet1/1/23",
- "uid": "salome"
},
{
+ "kind": "switch",
+ "port": "1",
+ "snmp_name": "ethernet1/1/24",
+ "uid": "salome"
},
{
"kind": "switch",
diff --git a/data/grid5000/sites/lyon/network_equipments/salome.json b/data/grid5000/sites/lyon/network_equipments/salome.json
index f97755b6d1e..e02ca8ce80f 100644
--- a/data/grid5000/sites/lyon/network_equipments/salome.json
+++ b/data/grid5000/sites/lyon/network_equipments/salome.json
@@ -11,14 +11,12 @@
"kind": "node",
"port": "eth1",
"ports": [
- {
- },
{
},
{
"kind": "router",
- "port": "0:23",
- "snmp_name": "GigabitEthernet2",
+ "port": "0:24",
+ "snmp_name": "GigabitEthernet1",
"uid": "gw"
},
{
@@ -26,7 +24,7 @@
{
"kind": "other",
"port": "eth1",
- "snmp_name": "GigabitEthernet4",
+ "snmp_name": "GigabitEthernet3",
"uid": "sw-admin"
},
{
@@ -61,6 +59,8 @@
},
{
},
+ {
+ },
{
"kind": "node",
"port": "eth1",
diff --git a/input/grid5000/sites/lyon/networks/gw-lyon.yaml b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
index 32a09d08578..22fef317ada 100644
--- a/input/grid5000/sites/lyon/networks/gw-lyon.yaml
+++ b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
@@ -100,10 +100,10 @@ gw:
22:
uid: alcor
kind: server
- 23:
+ 24:
uid: salome
kind: switch
- port: '2'
+ port: '1'
25:
snmp_pattern: 'ethernet1/1/25:1'
uid: force10
diff --git a/input/grid5000/sites/lyon/networks/salome.yaml b/input/grid5000/sites/lyon/networks/salome.yaml
index c7727f7f02b..bf1c2162040 100644
--- a/input/grid5000/sites/lyon/networks/salome.yaml
+++ b/input/grid5000/sites/lyon/networks/salome.yaml
@@ -32,11 +32,11 @@ salome:
rate: 1000000000
port: eth1
ports:
- 2:
+ 1:
uid: gw
kind: router
- port: "0:23"
- 4:
+ port: "0:24"
+ 3:
uid: sw-admin
kind: other
21: sagittaire-1
--
GitLab