From 43defc09ceb53462f843fac12fd6c0ca7429758b Mon Sep 17 00:00:00 2001
From: PARISOT Clement <clement.parisot@inria.fr>
Date: Mon, 19 May 2025 14:49:05 +0200
Subject: [PATCH] [sophia] network - sw-7 : fix snmp pattern
---
.../clusters/esterel31/nodes/esterel31-1.json | 2 +-
.../clusters/esterel31/nodes/esterel31-2.json | 2 +-
.../clusters/esterel31/nodes/esterel31-3.json | 2 +-
.../clusters/esterel31/nodes/esterel31-4.json | 2 +-
.../sites/sophia/network_equipments/sw-7.json | 14 +++++++-------
input/grid5000/sites/sophia/networks/sw-7.yaml | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json
index e819ddd474c..2a22997c743 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-1.json
@@ -182,7 +182,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sw-7",
- "switch_port": "Te1/0/2",
+ "switch_port": "Unit: 1 Slot: 0 Port: 2 10G - Level",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json
index 3e26191323d..cd9710d3fdb 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-2.json
@@ -182,7 +182,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sw-7",
- "switch_port": "Te1/0/3",
+ "switch_port": "Unit: 1 Slot: 0 Port: 3 10G - Level",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json
index 676978075c7..3094f64fbf3 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-3.json
@@ -182,7 +182,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sw-7",
- "switch_port": "Te1/0/5",
+ "switch_port": "Unit: 1 Slot: 0 Port: 5 10G - Level",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json
index acca10cb9d9..0140d35c730 100644
--- a/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json
+++ b/data/grid5000/sites/sophia/clusters/esterel31/nodes/esterel31-4.json
@@ -182,7 +182,7 @@
"sriov": false,
"sriov_totalvfs": 0,
"switch": "sw-7",
- "switch_port": "Te1/0/6",
+ "switch_port": "Unit: 1 Slot: 0 Port: 6 10G - Level",
"vendor": "Broadcom Inc. and subsidiaries"
},
{
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-7.json b/data/grid5000/sites/sophia/network_equipments/sw-7.json
index 7e14920c274..f96d4f6a1dd 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-7.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-7.json
@@ -14,13 +14,13 @@
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Te1/0/2",
+ "snmp_name": "Unit: 1 Slot: 0 Port: 2 10G - Level",
"uid": "esterel31-1"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Te1/0/3",
+ "snmp_name": "Unit: 1 Slot: 0 Port: 3 10G - Level",
"uid": "esterel31-2"
},
{
@@ -28,13 +28,13 @@
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Te1/0/5",
+ "snmp_name": "Unit: 1 Slot: 0 Port: 5 10G - Level",
"uid": "esterel31-3"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Te1/0/6",
+ "snmp_name": "Unit: 1 Slot: 0 Port: 6 10G - Level",
"uid": "esterel31-4"
},
{
@@ -72,18 +72,18 @@
{
"kind": "router",
"rate": 1000000000,
- "snmp_name": "Te1/0/23",
+ "snmp_name": "Unit: 1 Slot: 0 Port: 23 10G - Level",
"uid": "gw"
},
{
"kind": "switch",
"rate": 1000000000,
- "snmp_name": "Te1/0/24",
+ "snmp_name": "Unit: 1 Slot: 0 Port: 24 10G - Level",
"uid": "swadmin-7"
}
],
"rate": 10000000000,
- "snmp_pattern": "Te1/%LINECARD%/%PORT%"
+ "snmp_pattern": "Unit: 1 Slot: %LINECARD% Port: %PORT% 10G - Level"
}
],
"managed_by_us": true,
diff --git a/input/grid5000/sites/sophia/networks/sw-7.yaml b/input/grid5000/sites/sophia/networks/sw-7.yaml
index 4522f5d4617..ee805ad5b25 100644
--- a/input/grid5000/sites/sophia/networks/sw-7.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-7.yaml
@@ -60,7 +60,7 @@ sw-7:
backplane_bps: 1280000000000
linecards:
0:
- snmp_pattern: "Te1/%LINECARD%/%PORT%"
+ snmp_pattern: "Unit: 1 Slot: %LINECARD% Port: %PORT% 10G - Level"
kavlan_pattern: "Te1/%LINECARD%/%PORT%"
rate: 10000000000
kind: node
--
GitLab