From 6b87759172c069acfaae88191a189f85c30091c5 Mon Sep 17 00:00:00 2001
From: Hugo Dominois <hugo.dominois@inria.fr>
Date: Tue, 8 Apr 2025 09:47:58 +0200
Subject: [PATCH] [sophia][esterel22] Add network description
---
.../sites/sophia/clusters/esterel22/nodes/esterel22-1.json | 4 ++--
data/grid5000/sites/sophia/network_equipments/sw-2.json | 4 ++++
data/grid5000/sites/sophia/network_equipments/swadmin-2.json | 3 +++
input/grid5000/sites/sophia/networks/sw-2.yaml | 2 ++
input/grid5000/sites/sophia/networks/swadmin-2.yaml | 3 +++
5 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.json b/data/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.json
index f778691b1be..1c8f6244551 100644
--- a/data/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "esterel22-1.sophia.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "sw-2",
+ "switch_port": "1/1/32"
},
{
"device": "bmc",
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-2.json b/data/grid5000/sites/sophia/network_equipments/sw-2.json
index 463d63f8c53..b2c6c7b666a 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-2.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-2.json
@@ -111,6 +111,10 @@
{
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/32",
+ "uid": "esterel22-1"
},
{
"kind": "node",
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-2.json b/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
index 99360916c89..e318bbd9b47 100644
--- a/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-2.json
@@ -71,6 +71,9 @@
"uid": "esterel32-1-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "1/1/13",
+ "uid": "esterel22-1-bmc"
},
{
},
diff --git a/input/grid5000/sites/sophia/networks/sw-2.yaml b/input/grid5000/sites/sophia/networks/sw-2.yaml
index baf2898fccc..cb4d63f1f17 100644
--- a/input/grid5000/sites/sophia/networks/sw-2.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-2.yaml
@@ -48,6 +48,8 @@ sw-2:
uid: esterel26-1
18:
uid: esterel32-1
+ 32:
+ uid: esterel22-1
33:
uid: esterel10-2
port: eth1
diff --git a/input/grid5000/sites/sophia/networks/swadmin-2.yaml b/input/grid5000/sites/sophia/networks/swadmin-2.yaml
index 5bc03730674..52ed2520a98 100644
--- a/input/grid5000/sites/sophia/networks/swadmin-2.yaml
+++ b/input/grid5000/sites/sophia/networks/swadmin-2.yaml
@@ -50,6 +50,9 @@ swadmin-2:
12:
uid: esterel32-1-bmc
kind: other
+ 13:
+ uid: esterel22-1-bmc
+ kind: other
25:
uid: sw-2
kind: switch
--
GitLab