From 62fe25b2baf53caea6ce0aedcf01e11729d6e24f Mon Sep 17 00:00:00 2001
From: Laurent Mirtain <Laurent.Mirtain@inria.fr>
Date: Thu, 13 Mar 2025 10:57:05 +0100
Subject: [PATCH] [sophia][network] add sw-5 and update config for gw-sophia
sw-{2,3,6} swadmin-{2,3} to change uplink topology
---
.../sites/sophia/network_equipments/gw.json | 4 +
.../sites/sophia/network_equipments/sw-2.json | 8 +-
.../sites/sophia/network_equipments/sw-3.json | 6 ++
.../sites/sophia/network_equipments/sw-5.json | 85 +++++++++++++++++++
.../sophia/network_equipments/swadmin-2.json | 5 +-
.../sophia/network_equipments/swadmin-3.json | 7 +-
.../sophia/network_equipments/swadmin-5.json | 2 +-
.../sites/sophia/networks/gw-sophia.yaml | 4 +
.../grid5000/sites/sophia/networks/sw-2.yaml | 8 +-
.../grid5000/sites/sophia/networks/sw-3.yaml | 5 +-
.../grid5000/sites/sophia/networks/sw-5.yaml | 25 ++++++
.../grid5000/sites/sophia/networks/sw-6.yaml | 1 -
.../sites/sophia/networks/swadmin-2.yaml | 3 +-
.../sites/sophia/networks/swadmin-3.yaml | 11 +--
.../sites/sophia/networks/swadmin-5.yaml | 2 +-
15 files changed, 148 insertions(+), 28 deletions(-)
create mode 100644 data/grid5000/sites/sophia/network_equipments/sw-5.json
create mode 100644 input/grid5000/sites/sophia/networks/sw-5.yaml
diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index 86774f608b1..02017247ee2 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -231,6 +231,10 @@
"uid": "LABO"
},
{
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/44",
+ "uid": "sw-5"
},
{
"kind": "switch",
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-2.json b/data/grid5000/sites/sophia/network_equipments/sw-2.json
index 679677ecb1d..dc7b512fe65 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-2.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-2.json
@@ -135,9 +135,6 @@
{
},
{
- "kind": "switch",
- "snmp_name": "1/1/40",
- "uid": "swadmin-2"
},
{
},
@@ -150,9 +147,6 @@
{
},
{
- "kind": "switch",
- "snmp_name": "1/1/46",
- "uid": "swadmin-3"
},
{
},
@@ -168,7 +162,7 @@
"kind": "switch",
"rate": 10000000000,
"snmp_name": "1/1/50",
- "uid": "swadmin-5"
+ "uid": "swadmin-2"
}
],
"rate": 1000000000,
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-3.json b/data/grid5000/sites/sophia/network_equipments/sw-3.json
index 828c2915f27..f82fd23ff16 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-3.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-3.json
@@ -247,6 +247,12 @@
"rate": 10000000000,
"snmp_name": "1/1/51",
"uid": "gw"
+ },
+ {
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/52",
+ "uid": "swadmin-3"
}
],
"rate": 1000000000,
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-5.json b/data/grid5000/sites/sophia/network_equipments/sw-5.json
new file mode 100644
index 00000000000..373b150f9a2
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/sw-5.json
@@ -0,0 +1,85 @@
+{
+ "ip": "172.17.143.242",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "router",
+ "rate": 10000000000,
+ "snmp_name": "1/1/25",
+ "uid": "gw"
+ },
+ {
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/26",
+ "uid": "swadmin-5"
+ }
+ ],
+ "rate": 1000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "Aruba 2930F",
+ "site": "sophia",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "sw-5",
+ "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-2.json b/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
index 582edbf0da8..6526a12777b 100644
--- a/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
@@ -86,9 +86,12 @@
},
{
},
+ {
+ },
{
"kind": "switch",
- "snmp_name": "1/1/24",
+ "rate": 10000000000,
+ "snmp_name": "1/1/25",
"uid": "sw-2"
}
],
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-3.json b/data/grid5000/sites/sophia/network_equipments/swadmin-3.json
index 159f6ea038a..f6138cc8e8e 100644
--- a/data/grid5000/sites/sophia/network_equipments/swadmin-3.json
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-3.json
@@ -120,11 +120,12 @@
{
},
{
- "kind": "switch",
- "snmp_name": "1/1/24",
- "uid": "sw-2"
},
{
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/25",
+ "uid": "sw-3"
},
{
"kind": "switch",
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-5.json b/data/grid5000/sites/sophia/network_equipments/swadmin-5.json
index 364dd724680..6a43eab206b 100644
--- a/data/grid5000/sites/sophia/network_equipments/swadmin-5.json
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-5.json
@@ -62,7 +62,7 @@
"kind": "switch",
"rate": 10000000000,
"snmp_name": "1/1/25",
- "uid": "sw-2"
+ "uid": "sw-5"
}
],
"rate": 1000000000,
diff --git a/input/grid5000/sites/sophia/networks/gw-sophia.yaml b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
index a66e11650fe..c9d805654b9 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -145,6 +145,10 @@ gw:
uid: LABO
kind: other
rate: 10000000000
+ 44:
+ uid: sw-5
+ kind: switch
+ rate: 10000000000
45:
uid: sw-3
kind: switch
diff --git a/input/grid5000/sites/sophia/networks/sw-2.yaml b/input/grid5000/sites/sophia/networks/sw-2.yaml
index 617ea7a19ba..36a246d3fa0 100644
--- a/input/grid5000/sites/sophia/networks/sw-2.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-2.yaml
@@ -55,17 +55,11 @@ sw-2:
port: eth1
36:
uid: esterel41-1
- 40:
- uid: swadmin-2
- kind: switch
- 46:
- uid: swadmin-3
- kind: switch
49:
uid: gw
kind: router
rate: 10000000000
50:
- uid: swadmin-5
+ uid: swadmin-2
kind: switch
rate: 10000000000
diff --git a/input/grid5000/sites/sophia/networks/sw-3.yaml b/input/grid5000/sites/sophia/networks/sw-3.yaml
index 0c2214f487a..83b37d59a7f 100644
--- a/input/grid5000/sites/sophia/networks/sw-3.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-3.yaml
@@ -84,4 +84,7 @@ sw-3:
uid: gw
kind: router
rate: 10000000000
-
+ 52:
+ uid: swadmin-3
+ kind: switch
+ rate: 10000000000
diff --git a/input/grid5000/sites/sophia/networks/sw-5.yaml b/input/grid5000/sites/sophia/networks/sw-5.yaml
new file mode 100644
index 00000000000..77e36ca0993
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/sw-5.yaml
@@ -0,0 +1,25 @@
+---
+sw-5:
+ model: Aruba 2930F
+ warranty: 2029-11
+ kind: switch
+ managed_by_us: true
+ site: sophia
+ ip: 172.17.143.242
+ snmp_community: public
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 1000000000
+ kind: node
+ ports:
+ 25:
+ uid: gw
+ kind: router
+ rate: 10000000000
+ 26:
+ uid: swadmin-5
+ kind: switch
+ rate: 10000000000
+
diff --git a/input/grid5000/sites/sophia/networks/sw-6.yaml b/input/grid5000/sites/sophia/networks/sw-6.yaml
index c59ae46fbc0..4384c35db95 100644
--- a/input/grid5000/sites/sophia/networks/sw-6.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-6.yaml
@@ -38,4 +38,3 @@ sw-6:
uid: swadmin-6
kind: switch
rate: 10000000000
-
diff --git a/input/grid5000/sites/sophia/networks/swadmin-2.yaml b/input/grid5000/sites/sophia/networks/swadmin-2.yaml
index 1268cbf5b76..5e7e41418d3 100644
--- a/input/grid5000/sites/sophia/networks/swadmin-2.yaml
+++ b/input/grid5000/sites/sophia/networks/swadmin-2.yaml
@@ -44,6 +44,7 @@ swadmin-2:
10:
uid: esterel41-1-bmc
kind: other
- 24:
+ 25:
uid: sw-2
kind: switch
+ rate: 10000000000
diff --git a/input/grid5000/sites/sophia/networks/swadmin-3.yaml b/input/grid5000/sites/sophia/networks/swadmin-3.yaml
index d4635f24bed..72c226683fb 100644
--- a/input/grid5000/sites/sophia/networks/swadmin-3.yaml
+++ b/input/grid5000/sites/sophia/networks/swadmin-3.yaml
@@ -77,10 +77,11 @@ swadmin-3:
22:
uid: uvb-9-bmc
kind: other
- 24:
- uid: sw-2
+ 25:
+ uid: sw-3
kind: switch
+ rate: 10000000000
26:
- uid: swadmin-4
- kind: switch
- rate: 10000000000
+ uid: swadmin-4
+ kind: switch
+ rate: 10000000000
diff --git a/input/grid5000/sites/sophia/networks/swadmin-5.yaml b/input/grid5000/sites/sophia/networks/swadmin-5.yaml
index d99ee57173e..49fea65be49 100644
--- a/input/grid5000/sites/sophia/networks/swadmin-5.yaml
+++ b/input/grid5000/sites/sophia/networks/swadmin-5.yaml
@@ -15,6 +15,6 @@ swadmin-5:
kind: node
ports:
25:
- uid: sw-2
+ uid: sw-5
kind: switch
rate: 10000000000
--
GitLab