From 0685bfcfd72dfe28f17bd731817f6620b3227d8b Mon Sep 17 00:00:00 2001
From: Laurent Mirtain <Laurent.Mirtain@inria.fr>
Date: Fri, 28 Feb 2025 07:42:53 +0100
Subject: [PATCH 1/2] [sophia][network] add prod switch (sw-6) and admin switch
(swadmin-[2-6])
---
.../sites/sophia/network_equipments/gw.json | 6 +-
.../sites/sophia/network_equipments/sw-2.json | 6 +
.../sites/sophia/network_equipments/sw-6.json | 113 ++++++++++++++
.../sophia/network_equipments/swadmin-2.json | 106 +++++++++++++
.../sophia/network_equipments/swadmin-3.json | 147 ++++++++++++++++++
.../sophia/network_equipments/swadmin-4.json | 106 +++++++++++++
.../sophia/network_equipments/swadmin-5.json | 79 ++++++++++
.../sophia/network_equipments/swadmin-6.json | 100 ++++++++++++
.../sites/sophia/networks/gw-sophia.yaml | 8 +-
.../grid5000/sites/sophia/networks/sw-2.yaml | 4 +
.../grid5000/sites/sophia/networks/sw-6.yaml | 39 +++++
.../sites/sophia/networks/swadmin-2.yaml | 49 ++++++
.../sites/sophia/networks/swadmin-3.yaml | 86 ++++++++++
.../sites/sophia/networks/swadmin-4.yaml | 48 ++++++
.../sites/sophia/networks/swadmin-5.yaml | 20 +++
.../sites/sophia/networks/swadmin-6.yaml | 41 +++++
16 files changed, 955 insertions(+), 3 deletions(-)
create mode 100644 data/grid5000/sites/sophia/network_equipments/sw-6.json
create mode 100644 data/grid5000/sites/sophia/network_equipments/swadmin-2.json
create mode 100644 data/grid5000/sites/sophia/network_equipments/swadmin-3.json
create mode 100644 data/grid5000/sites/sophia/network_equipments/swadmin-4.json
create mode 100644 data/grid5000/sites/sophia/network_equipments/swadmin-5.json
create mode 100644 data/grid5000/sites/sophia/network_equipments/swadmin-6.json
create mode 100644 input/grid5000/sites/sophia/networks/sw-6.yaml
create mode 100644 input/grid5000/sites/sophia/networks/swadmin-2.yaml
create mode 100644 input/grid5000/sites/sophia/networks/swadmin-3.yaml
create mode 100644 input/grid5000/sites/sophia/networks/swadmin-4.yaml
create mode 100644 input/grid5000/sites/sophia/networks/swadmin-5.yaml
create mode 100644 input/grid5000/sites/sophia/networks/swadmin-6.yaml
diff --git a/data/grid5000/sites/sophia/network_equipments/gw.json b/data/grid5000/sites/sophia/network_equipments/gw.json
index e3e4cddaca8..86774f608b1 100644
--- a/data/grid5000/sites/sophia/network_equipments/gw.json
+++ b/data/grid5000/sites/sophia/network_equipments/gw.json
@@ -219,10 +219,14 @@
"uid": "lag4"
},
{
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/42",
+ "uid": "sw-6"
},
{
"kind": "other",
- "rate": 1000000000,
+ "rate": 10000000000,
"snmp_name": "1/1/43",
"uid": "LABO"
},
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-2.json b/data/grid5000/sites/sophia/network_equipments/sw-2.json
index 0927e9ee665..6a0d6272d5f 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-2.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-2.json
@@ -169,6 +169,12 @@
"rate": 10000000000,
"snmp_name": "1/1/49",
"uid": "gw"
+ },
+ {
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/50",
+ "uid": "swadmin-5"
}
],
"rate": 1000000000,
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-6.json b/data/grid5000/sites/sophia/network_equipments/sw-6.json
new file mode 100644
index 00000000000..af4c7525a37
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/sw-6.json
@@ -0,0 +1,113 @@
+{
+ "ip": "172.17.143.240",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/13",
+ "uid": "esterel1-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/14",
+ "uid": "esterel5-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/15",
+ "uid": "esterel5-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/16",
+ "uid": "esterel6-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/17",
+ "uid": "esterel7-1"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/18",
+ "uid": "esterel7-2"
+ },
+ {
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/19",
+ "uid": "esterel27-1"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "router",
+ "rate": 10000000000,
+ "snmp_name": "1/1/25",
+ "uid": "gw"
+ },
+ {
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/26",
+ "uid": "swadmin-6"
+ }
+ ],
+ "rate": 1000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "Aruba 2930F",
+ "site": "sophia",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "sw-6",
+ "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
new file mode 100644
index 00000000000..582edbf0da8
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
@@ -0,0 +1,106 @@
+{
+ "ip": "172.17.143.229",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/1",
+ "uid": "musa-1-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/2",
+ "uid": "musa-2-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/3",
+ "uid": "musa-3-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/4",
+ "uid": "musa-4-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/5",
+ "uid": "musa-5-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/6",
+ "uid": "musa-6-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/7",
+ "uid": "esterel10-1-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/8",
+ "uid": "esterel10-2-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/9",
+ "uid": "esterel10-3-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/10",
+ "uid": "esterel41-1-bmc"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "1/1/24",
+ "uid": "sw-2"
+ }
+ ],
+ "rate": 1000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "Aruba 2930F",
+ "site": "sophia",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "swadmin-2",
+ "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-3.json b/data/grid5000/sites/sophia/network_equipments/swadmin-3.json
new file mode 100644
index 00000000000..159f6ea038a
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-3.json
@@ -0,0 +1,147 @@
+{
+ "ip": "172.17.143.227",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/1",
+ "uid": "uvb-11-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/2",
+ "uid": "uvb-12-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/3",
+ "uid": "mercantour1-15-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/4",
+ "uid": "mercantour1-16-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/5",
+ "uid": "mercantour1-11-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/6",
+ "uid": "mercantour1-12-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/7",
+ "uid": "mercantour1-7-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/8",
+ "uid": "mercantour1-8-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/9",
+ "uid": "mercantour1-3-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/10",
+ "uid": "mercantour1-4-bmc"
+ },
+ {
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/12",
+ "uid": "mercantour2-5-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/13",
+ "uid": "mercantour1-2-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/14",
+ "uid": "mercantour1-1-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/15",
+ "uid": "mercantour1-6-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/16",
+ "uid": "mercantour1-5-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/17",
+ "uid": "mercantour1-10-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/18",
+ "uid": "mercantour1-9-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/19",
+ "uid": "mercantour1-14-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/20",
+ "uid": "mercantour1-13-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/21",
+ "uid": "uvb-10-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/22",
+ "uid": "uvb-9-bmc"
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "snmp_name": "1/1/24",
+ "uid": "sw-2"
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/26",
+ "uid": "swadmin-4"
+ }
+ ],
+ "rate": 1000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "Aruba 2930F",
+ "site": "sophia",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "swadmin-3",
+ "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-4.json b/data/grid5000/sites/sophia/network_equipments/swadmin-4.json
new file mode 100644
index 00000000000..86cb27645fa
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-4.json
@@ -0,0 +1,106 @@
+{
+ "ip": "172.17.143.225",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/1",
+ "uid": "mercantour2-4-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/2",
+ "uid": "mercantour2-3-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/3",
+ "uid": "mercantour2-8-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/4",
+ "uid": "mercantour2-7-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/5",
+ "uid": "musa-5-bmc"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/21",
+ "uid": "mercantour6-1-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/22",
+ "uid": "mercantour2-6-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/23",
+ "uid": "mercantour2-1-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/24",
+ "uid": "mercantour2-2-bmc"
+ },
+ {
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/25",
+ "uid": "swadmin-3"
+ }
+ ],
+ "rate": 1000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "Aruba 2930F",
+ "site": "sophia",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "swadmin-4",
+ "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-5.json b/data/grid5000/sites/sophia/network_equipments/swadmin-5.json
new file mode 100644
index 00000000000..364dd724680
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-5.json
@@ -0,0 +1,79 @@
+{
+ "ip": "172.17.143.223",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/25",
+ "uid": "sw-2"
+ }
+ ],
+ "rate": 1000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "Aruba 2930F",
+ "site": "sophia",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "swadmin-5",
+ "warranty": "2029-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-6.json b/data/grid5000/sites/sophia/network_equipments/swadmin-6.json
new file mode 100644
index 00000000000..3bb0c06cd66
--- /dev/null
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-6.json
@@ -0,0 +1,100 @@
+{
+ "ip": "172.17.143.221",
+ "kind": "switch",
+ "linecards": [
+ {
+ },
+ {
+ "kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "kind": "node",
+ "ports": [
+ {
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/1",
+ "uid": "esterel1-1-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/2",
+ "uid": "esterel5-1-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/3",
+ "uid": "esterel5-2-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/4",
+ "uid": "esterel6-1-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/5",
+ "uid": "esterel7-1-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/6",
+ "uid": "esterel7-2-bmc"
+ },
+ {
+ "kind": "other",
+ "snmp_name": "1/1/7",
+ "uid": "esterel27-1-bmc"
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ },
+ {
+ "kind": "switch",
+ "rate": 10000000000,
+ "snmp_name": "1/1/25",
+ "uid": "sw-6"
+ }
+ ],
+ "rate": 1000000000,
+ "snmp_pattern": "%LINECARD%/1/%PORT%"
+ }
+ ],
+ "managed_by_us": true,
+ "model": "Aruba 2930F",
+ "site": "sophia",
+ "snmp_community": "public",
+ "type": "network_equipment",
+ "uid": "swadmin-6",
+ "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 9ad8b5b9dda..a66e11650fe 100644
--- a/input/grid5000/sites/sophia/networks/gw-sophia.yaml
+++ b/input/grid5000/sites/sophia/networks/gw-sophia.yaml
@@ -137,10 +137,14 @@ gw:
uid: lag4
kind: channel
rate: 100000000000
+ 42:
+ uid: sw-6
+ kind: switch
+ rate: 10000000000
43:
uid: LABO
kind: other
- rate: 1000000000
+ rate: 10000000000
45:
uid: sw-3
kind: switch
@@ -187,4 +191,4 @@ gw:
kind: server
rate: 200000000000
uid: srv-scratch3
- port: lag7
\ No newline at end of file
+ port: lag7
diff --git a/input/grid5000/sites/sophia/networks/sw-2.yaml b/input/grid5000/sites/sophia/networks/sw-2.yaml
index 1d305ed5bd5..c0f43f367a8 100644
--- a/input/grid5000/sites/sophia/networks/sw-2.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-2.yaml
@@ -71,3 +71,7 @@ sw-2:
uid: gw
kind: router
rate: 10000000000
+ 50:
+ 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
new file mode 100644
index 00000000000..83fc73c15e8
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/sw-6.yaml
@@ -0,0 +1,39 @@
+---
+sw-6:
+ model: Aruba 2930F
+ warranty: 2029-11
+ kind: switch
+ managed_by_us: true
+ site: sophia
+ ip: 172.17.143.240
+ snmp_community: public
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 1000000000
+ kind: node
+ ports:
+ 13:
+ uid: esterel1-1
+ 14:
+ uid: esterel5-1
+ 15:
+ uid: esterel5-2
+ 16:
+ uid: esterel6-1
+ 17:
+ uid: esterel7-1
+ 18:
+ uid: esterel7-2
+ 19:
+ uid: esterel27-1
+ 25:
+ uid: gw
+ kind: router
+ rate: 10000000000
+ 26:
+ 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
new file mode 100644
index 00000000000..1268cbf5b76
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-2.yaml
@@ -0,0 +1,49 @@
+---
+swadmin-2:
+ model: Aruba 2930F
+ warranty: 2029-11
+ kind: switch
+ managed_by_us: true
+ site: sophia
+ ip: 172.17.143.229
+ snmp_community: public
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 1000000000
+ kind: node
+ ports:
+ 1:
+ uid: musa-1-bmc
+ kind: other
+ 2:
+ uid: musa-2-bmc
+ kind: other
+ 3:
+ uid: musa-3-bmc
+ kind: other
+ 4:
+ uid: musa-4-bmc
+ kind: other
+ 5:
+ uid: musa-5-bmc
+ kind: other
+ 6:
+ uid: musa-6-bmc
+ kind: other
+ 7:
+ uid: esterel10-1-bmc
+ kind: other
+ 8:
+ uid: esterel10-2-bmc
+ kind: other
+ 9:
+ uid: esterel10-3-bmc
+ kind: other
+ 10:
+ uid: esterel41-1-bmc
+ kind: other
+ 24:
+ uid: sw-2
+ kind: switch
diff --git a/input/grid5000/sites/sophia/networks/swadmin-3.yaml b/input/grid5000/sites/sophia/networks/swadmin-3.yaml
new file mode 100644
index 00000000000..d4635f24bed
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-3.yaml
@@ -0,0 +1,86 @@
+---
+swadmin-3:
+ model: Aruba 2930F
+ warranty: 2029-11
+ kind: switch
+ managed_by_us: true
+ site: sophia
+ ip: 172.17.143.227
+ snmp_community: public
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 1000000000
+ kind: node
+ ports:
+ 1:
+ uid: uvb-11-bmc
+ kind: other
+ 2:
+ uid: uvb-12-bmc
+ kind: other
+ 3:
+ uid: mercantour1-15-bmc
+ kind: other
+ 4:
+ uid: mercantour1-16-bmc
+ kind: other
+ 5:
+ uid: mercantour1-11-bmc
+ kind: other
+ 6:
+ uid: mercantour1-12-bmc
+ kind: other
+ 7:
+ uid: mercantour1-7-bmc
+ kind: other
+ 8:
+ uid: mercantour1-8-bmc
+ kind: other
+ 9:
+ uid: mercantour1-3-bmc
+ kind: other
+ 10:
+ uid: mercantour1-4-bmc
+ kind: other
+ 12:
+ uid: mercantour2-5-bmc
+ kind: other
+ 13:
+ uid: mercantour1-2-bmc
+ kind: other
+ 14:
+ uid: mercantour1-1-bmc
+ kind: other
+ 15:
+ uid: mercantour1-6-bmc
+ kind: other
+ 16:
+ uid: mercantour1-5-bmc
+ kind: other
+ 17:
+ uid: mercantour1-10-bmc
+ kind: other
+ 18:
+ uid: mercantour1-9-bmc
+ kind: other
+ 19:
+ uid: mercantour1-14-bmc
+ kind: other
+ 20:
+ uid: mercantour1-13-bmc
+ kind: other
+ 21:
+ uid: uvb-10-bmc
+ kind: other
+ 22:
+ uid: uvb-9-bmc
+ kind: other
+ 24:
+ uid: sw-2
+ kind: switch
+ 26:
+ uid: swadmin-4
+ kind: switch
+ rate: 10000000000
diff --git a/input/grid5000/sites/sophia/networks/swadmin-4.yaml b/input/grid5000/sites/sophia/networks/swadmin-4.yaml
new file mode 100644
index 00000000000..1d17abe0fc9
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-4.yaml
@@ -0,0 +1,48 @@
+---
+swadmin-4:
+ model: Aruba 2930F
+ warranty: 2029-11
+ kind: switch
+ managed_by_us: true
+ site: sophia
+ ip: 172.17.143.225
+ snmp_community: public
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 1000000000
+ kind: node
+ ports:
+ 1:
+ uid: mercantour2-4-bmc
+ kind: other
+ 2:
+ uid: mercantour2-3-bmc
+ kind: other
+ 3:
+ uid: mercantour2-8-bmc
+ kind: other
+ 4:
+ uid: mercantour2-7-bmc
+ kind: other
+ 5:
+ uid: musa-5-bmc
+ kind: other
+ 21:
+ uid: mercantour6-1-bmc
+ kind: other
+ 22:
+ uid: mercantour2-6-bmc
+ kind: other
+ 23:
+ uid: mercantour2-1-bmc
+ kind: other
+ 24:
+ uid: mercantour2-2-bmc
+ kind: other
+ 25:
+ uid: swadmin-3
+ kind: switch
+ rate: 10000000000
+
diff --git a/input/grid5000/sites/sophia/networks/swadmin-5.yaml b/input/grid5000/sites/sophia/networks/swadmin-5.yaml
new file mode 100644
index 00000000000..d99ee57173e
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-5.yaml
@@ -0,0 +1,20 @@
+---
+swadmin-5:
+ model: Aruba 2930F
+ warranty: 2029-11
+ kind: switch
+ managed_by_us: true
+ site: sophia
+ ip: 172.17.143.223
+ snmp_community: public
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 1000000000
+ kind: node
+ ports:
+ 25:
+ uid: sw-2
+ kind: switch
+ rate: 10000000000
diff --git a/input/grid5000/sites/sophia/networks/swadmin-6.yaml b/input/grid5000/sites/sophia/networks/swadmin-6.yaml
new file mode 100644
index 00000000000..7f02aff3c30
--- /dev/null
+++ b/input/grid5000/sites/sophia/networks/swadmin-6.yaml
@@ -0,0 +1,41 @@
+---
+swadmin-6:
+ model: Aruba 2930F
+ warranty: 2029-11
+ kind: switch
+ managed_by_us: true
+ site: sophia
+ ip: 172.17.143.221
+ snmp_community: public
+ linecards:
+ 1:
+ snmp_pattern: "%LINECARD%/1/%PORT%"
+ kavlan_pattern: "%LINECARD%/1/%PORT%"
+ rate: 1000000000
+ kind: node
+ ports:
+ 1:
+ uid: esterel1-1-bmc
+ kind: other
+ 2:
+ uid: esterel5-1-bmc
+ kind: other
+ 3:
+ uid: esterel5-2-bmc
+ kind: other
+ 4:
+ uid: esterel6-1-bmc
+ kind: other
+ 5:
+ uid: esterel7-1-bmc
+ kind: other
+ 6:
+ uid: esterel7-2-bmc
+ kind: other
+ 7:
+ uid: esterel27-1-bmc
+ kind: other
+ 25:
+ uid: sw-6
+ kind: switch
+ rate: 10000000000
--
GitLab
From baf59a1bc9b80ab2c2e28e5a135fee28512aa223 Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Fri, 28 Feb 2025 15:47:31 +0100
Subject: [PATCH 2/2] [sophia][esterel5] regenerate JSON after network switch
declaration
---
.../sites/sophia/clusters/esterel5/nodes/esterel5-1.json | 4 ++--
.../sites/sophia/clusters/esterel5/nodes/esterel5-2.json | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.json b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.json
index 46b65e74c7c..9980ef7c885 100644
--- a/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-1.json
@@ -144,8 +144,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-6",
+ "switch_port": "1/1/14",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.json b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.json
index e5ee1504469..05278213c57 100644
--- a/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.json
+++ b/data/grid5000/sites/sophia/clusters/esterel5/nodes/esterel5-2.json
@@ -144,8 +144,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-6",
+ "switch_port": "1/1/15",
"vendor": "Intel"
},
{
--
GitLab