From d93255f731e4ec7925488084c3a29bc01e74a445 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Mon, 13 Jan 2020 14:01:19 +0100
Subject: [PATCH] [lyon] Fix gw-lyon's snmp_pattern
---
data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json | 2 +-
data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json | 2 +-
data/grid5000/sites/lyon/network_equipments/gw-lyon.json | 4 +++-
input/grid5000/sites/lyon/networks/gw-lyon.yaml | 4 ++--
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
index bd1214df443..da02977b890 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
@@ -137,7 +137,7 @@
"network_address": "gemini-1.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "gw-lyon",
- "switch_port": "ethernet 1/0/1",
+ "switch_port": "ethernet1/1/1",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
index 73cd9ed2704..f32ac42f972 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
@@ -137,7 +137,7 @@
"network_address": "gemini-2.lyon.grid5000.fr",
"rate": 10000000000,
"switch": "gw-lyon",
- "switch_port": "ethernet 1/0/2",
+ "switch_port": "ethernet1/1/2",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/lyon/network_equipments/gw-lyon.json b/data/grid5000/sites/lyon/network_equipments/gw-lyon.json
index cd5c3679967..b0803b88ee0 100644
--- a/data/grid5000/sites/lyon/network_equipments/gw-lyon.json
+++ b/data/grid5000/sites/lyon/network_equipments/gw-lyon.json
@@ -2,6 +2,8 @@
"backplane_bps": 960000000000,
"kind": "router",
"linecards": [
+ {
+ },
{
"kavlan_pattern": "%PORT%",
"kind": "node",
@@ -96,7 +98,7 @@
}
],
"rate": 10000000000,
- "snmp_pattern": "ethernet 1/%LINECARD%/%PORT%"
+ "snmp_pattern": "ethernet1/%LINECARD%/%PORT%"
}
],
"model": "Dell EMC S4128F-ON",
diff --git a/input/grid5000/sites/lyon/networks/gw-lyon.yaml b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
index 56ab170a282..ccd0e47554c 100644
--- a/input/grid5000/sites/lyon/networks/gw-lyon.yaml
+++ b/input/grid5000/sites/lyon/networks/gw-lyon.yaml
@@ -64,8 +64,8 @@ gw-lyon:
- 10.15.192.0/18
backplane_bps: 960000000000
linecards:
- 0:
- snmp_pattern: "ethernet 1/%LINECARD%/%PORT%"
+ 1:
+ snmp_pattern: "ethernet1/%LINECARD%/%PORT%"
kavlan_pattern: "%PORT%"
kind: node
rate: 10000000000
--
GitLab