From 16653940b3fc80f4db86fab7f9b401b57621d0d9 Mon Sep 17 00:00:00 2001
From: Laurent Mirtain <Laurent.Mirtain@inria.fr>
Date: Sun, 13 Apr 2025 21:53:40 +0200
Subject: [PATCH 1/4] [sophia][network] add sw-7 and swadmin-7 and update
config for gw-sophia
---
.../sites/sophia/network_equipments/gw.json | 3 +
.../sites/sophia/network_equipments/sw-7.json | 169 ++++++++++++++++++
.../sophia/network_equipments/swadmin-7.json | 88 +++++++++
.../sites/sophia/networks/gw-sophia.yaml | 3 +
.../grid5000/sites/sophia/networks/sw-7.yaml | 81 +++++++++
.../sites/sophia/networks/swadmin-7.yaml | 31 ++++
6 files changed, 375 insertions(+)
create mode 100644 data/grid5000/sites/sophia/network_equipments/sw-7.json
create mode 100644 data/grid5000/sites/sophia/network_equipments/swadmin-7.json
create mode 100644 input/grid5000/sites/sophia/networks/sw-7.yaml
create mode 100644 input/grid5000/sites/sophia/networks/swadmin-7.yaml
diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index 02017247ee2..9d3b6d313b2 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -243,6 +243,9 @@
"uid": "sw-3"
},
{
+ "kind": "switch",
+ "snmp_name": "1/1/46",
+ "uid": "sw-7"
},
{
"kind": "switch",
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-7.json b/data/grid5000/sites/sophia/network_equipments/sw-7.json
new file mode 100644
index 00000000000..8fb866fa04a
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/sw-7.json
@@ -0,0 +1,169 @@
+{
+ "backplane_bps": 1280000000000,
+ "ip": "172.17.143.238",
+ "kind": "switch",
+ "linecards": [
+ {
+ "kavlan_pattern": "Te1/%LINECARD%/%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Te1/0/2",
+ "uid": "esterel31-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Te1/0/3",
+ "uid": "esterel31-2"
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Te1/0/5",
+ "uid": "esterel31-3"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "Te1/0/6",
+ "uid": "esterel31-4"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "router",
+ "snmp_name": "Te1/0/23",
+ "uid": "gw"
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "Te1/0/24",
+ "uid": "swadmin-6"
+ }
+ ],
+ "rate": 10000000000,
+ "snmp_pattern": "Te1/%LINECARD%/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "metrics": [
+ {
+ "description": "Input byte counter for the network device port",
+ "name": "network_ifacein_bytes_total",
+ "period": 15000,
+ "source": {
+ "id": "1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Output byte counter for the network device port",
+ "name": "network_ifaceout_bytes_total",
+ "period": 15000,
+ "source": {
+ "id": "1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Input packet counter for the network device port",
+ "name": "network_ifacein_packets_total",
+ "period": 15000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.11.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Output packet counter for the network device port",
+ "name": "network_ifaceout_packets_total",
+ "period": 15000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.17.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Input counter of discarded packets for the network device port",
+ "name": "network_ifacein_packets_discard_total",
+ "period": 15000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.13.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Output counter of discarded packets for the network device port",
+ "name": "network_ifaceout_packets_discard_total",
+ "period": 15000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.19.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Input counter of packet errors for the network device port",
+ "name": "network_ifacein_packets_error_total",
+ "period": 15000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.14.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ },
+ {
+ "description": "Output counter of packet errors for the network device port",
+ "name": "network_ifaceout_packets_error_total",
+ "period": 15000,
+ "source": {
+ "id": "1.3.6.1.2.1.2.2.1.20.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}",
+ "protocol": "snmp"
+ }
+ }
+ ],
+ "model": "Dell PowerSwitch N4032",
+ "serial": "6PX8XC2",
+ "site": "sophia",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "sw-7",
+ "warranty": "2019-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-7.json b/data/grid5000/sites/sophia/network_equipments/swadmin-7.json
new file mode 100644
index 00000000000..dcc6f18a270
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-7.json
@@ -0,0 +1,88 @@
+{
+ "ip": "172.17.143.219",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/1",
+ "uid": "esterel31-1-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/2",
+ "uid": "esterel31-2-bmc"
+ },
+ {
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/4",
+ "uid": "esterel31-3-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/5",
+ "uid": "esterel31-4-bmc"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "1/1/24",
+ "uid": "sw-7"
+ }
+ ],
+ "rate": 1000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "Aruba 2930F",
+ "site": "sophia",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "swadmin-7",
+ "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index c9d805654b9..ad9e1357505 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -153,6 +153,9 @@ gw:
uid: sw-3
kind: switch
rate: 10000000000
+ 46:
+ uid: sw-7
+ kind: switch
47:
uid: sw-2
kind: switch
diff --git a/input/grid5000/sites/sophia/networks/sw-7.yaml b/input/grid5000/sites/sophia/networks/sw-7.yaml
new file mode 100644
index 00000000000..6a23b5b67da
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/sw-7.yaml
@@ -0,0 +1,81 @@
+---
+sw-7:
+ model: Dell PowerSwitch N4032
+ serial: 6PX8XC2
+ warranty: 2019-11
+ kind: switch
+ managed_by_us: true
+ site: sophia
+ snmp_community: public
+ ip: 172.17.143.238
+ metrics:
+ - name: network_ifacein_bytes_total
+ description: Input byte counter for the network device port
+ period: 15000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.31.1.1.1.6.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ - name: network_ifaceout_bytes_total
+ description: Output byte counter for the network device port
+ period: 15000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.31.1.1.1.10.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ - name: network_ifacein_packets_total
+ description: Input packet counter for the network device port
+ period: 15000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.2.2.1.11.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ - name: network_ifaceout_packets_total
+ description: Output packet counter for the network device port
+ period: 15000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.2.2.1.17.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ - name: network_ifacein_packets_discard_total
+ description: Input counter of discarded packets for the network device port
+ period: 15000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.2.2.1.13.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ - name: network_ifaceout_packets_discard_total
+ description: Output counter of discarded packets for the network device port
+ period: 15000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.2.2.1.19.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ - name: network_ifacein_packets_error_total
+ description: Input counter of packet errors for the network device port
+ period: 15000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.2.2.1.14.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ - name: network_ifaceout_packets_error_total
+ description: Output counter of packet errors for the network device port
+ period: 15000
+ source:
+ protocol: snmp
+ id: 1.3.6.1.2.1.2.2.1.20.{{ 1.3.6.1.2.1.2.2.1.2 == %SNMP_IFACE% }}
+ backplane_bps: 1280000000000
+ linecards:
+ 0:
+ snmp_pattern: "Te1/%LINECARD%/%PORT%"
+ kavlan_pattern: "Te1/%LINECARD%/%PORT%"
+ rate: 10000000000
+ kind: node
+ ports:
+ 2:
+ uid: esterel31-1
+ 3:
+ uid: esterel31-2
+ 5:
+ uid: esterel31-3
+ 6:
+ uid: esterel31-4
+ 23:
+ uid: gw
+ kind: router
+ 24:
+ uid: swadmin-6
+ kind: switch
diff --git a/input/grid5000/sites/sophia/networks/swadmin-7.yaml b/input/grid5000/sites/sophia/networks/swadmin-7.yaml
new file mode 100644
index 00000000000..5ad7d7c8a91
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-7.yaml
@@ -0,0 +1,31 @@
+---
+swadmin-7:
+ model: Aruba 2930F
+ warranty: 2029-11
+ kind: switch
+ managed_by_us: true
+ site: sophia
+ ip: 172.17.143.219
+ snmp_community: public
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 1000000000
+ kind: node
+ ports:
+ 1:
+ uid: esterel31-1-bmc
+ kind: other
+ 2:
+ uid: esterel31-2-bmc
+ kind: other
+ 4:
+ uid: esterel31-3-bmc
+ kind: other
+ 5:
+ uid: esterel31-4-bmc
+ kind: other
+ 24:
+ uid: sw-7
+ kind: switch
--
GitLab
From aff06f2971b10c4ed3bd6e3320ac9b085d0a37cc Mon Sep 17 00:00:00 2001
From: Laurent Mirtain <Laurent.Mirtain@inria.fr>
Date: Sun, 13 Apr 2025 22:02:35 +0200
Subject: [PATCH 2/4] [sophia][network] correction for port 24 : swadmin-7
---
data/grid5000/sites/sophia/network_equipments/sw-7.json | 2 +-
input/grid5000/sites/sophia/networks/sw-7.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-7.json b/data/grid5000/sites/sophia/network_equipments/sw-7.json
index 8fb866fa04a..f31859f168d 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-7.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-7.json
@@ -77,7 +77,7 @@
{
"kind": "switch",
"snmp_name": "Te1/0/24",
- "uid": "swadmin-6"
+ "uid": "swadmin-7"
}
],
"rate": 10000000000,
diff --git a/input/grid5000/sites/sophia/networks/sw-7.yaml b/input/grid5000/sites/sophia/networks/sw-7.yaml
index 6a23b5b67da..52776e367ec 100644
--- a/input/grid5000/sites/sophia/networks/sw-7.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-7.yaml
@@ -77,5 +77,5 @@ sw-7:
uid: gw
kind: router
24:
- uid: swadmin-6
+ uid: swadmin-7
kind: switch
--
GitLab
From f6dd2e6f44e1d49d4842b490459ed706850758ab Mon Sep 17 00:00:00 2001
From: Laurent Mirtain <Laurent.Mirtain@inria.fr>
Date: Sun, 13 Apr 2025 22:13:37 +0200
Subject: [PATCH 3/4] [sophia][network] correction of rate for port 23 and port
24
---
data/grid5000/sites/sophia/network_equipments/sw-7.json | 2 ++
input/grid5000/sites/sophia/networks/sw-7.yaml | 2 ++
2 files changed, 4 insertions(+)
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-7.json b/data/grid5000/sites/sophia/network_equipments/sw-7.json
index f31859f168d..7e14920c274 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-7.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-7.json
@@ -71,11 +71,13 @@
},
{
"kind": "router",
+ "rate": 1000000000,
"snmp_name": "Te1/0/23",
"uid": "gw"
},
{
"kind": "switch",
+ "rate": 1000000000,
"snmp_name": "Te1/0/24",
"uid": "swadmin-7"
}
diff --git a/input/grid5000/sites/sophia/networks/sw-7.yaml b/input/grid5000/sites/sophia/networks/sw-7.yaml
index 52776e367ec..4522f5d4617 100644
--- a/input/grid5000/sites/sophia/networks/sw-7.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-7.yaml
@@ -76,6 +76,8 @@ sw-7:
23:
uid: gw
kind: router
+ rate: 1000000000
24:
uid: swadmin-7
kind: switch
+ rate: 1000000000
--
GitLab
From f3bee8785c39e4a7c559d0469301746ac19fab59 Mon Sep 17 00:00:00 2001
From: Laurent Mirtain <Laurent.Mirtain@inria.fr>
Date: Sun, 13 Apr 2025 22:18:14 +0200
Subject: [PATCH 4/4] [sophia][network] gw-sophia correction of rate for port
46
---
data/grid5000/sites/sophia/network_equipments/gw.json | 1 +
input/grid5000/sites/sophia/networks/gw-sophia.yaml | 1 +
2 files changed, 2 insertions(+)
diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index 9d3b6d313b2..9e12f08c943 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -244,6 +244,7 @@
},
{
"kind": "switch",
+ "rate": 1000000000,
"snmp_name": "1/1/46",
"uid": "sw-7"
},
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index ad9e1357505..bcdf8a3b231 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -156,6 +156,7 @@ gw:
46:
uid: sw-7
kind: switch
+ rate: 1000000000
47:
uid: sw-2
kind: switch
--
GitLab