From ed83b8e1087de9966c39087f2127d56c84da8644 Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Thu, 13 Feb 2025 09:47:45 +0100
Subject: [PATCH] [sophia][network] add info for esterel10
---
.../sophia/clusters/esterel10/nodes/esterel10-1.json | 4 ++--
.../sophia/clusters/esterel10/nodes/esterel10-2.json | 4 ++--
.../sophia/clusters/esterel10/nodes/esterel10-3.json | 4 ++--
.../sites/sophia/network_equipments/sw-2.json | 12 ++++++++++++
input/grid5000/sites/sophia/networks/sw-2.yaml | 11 ++++++++++-
5 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-1.json b/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-1.json
index 80eeb389ef3..54e7f47fb89 100644
--- a/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-1.json
@@ -178,8 +178,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-2",
+ "switch_port": "1/1/35",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-2.json b/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-2.json
index 7e68c91cb08..b182ef8f2e7 100644
--- a/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-2.json
+++ b/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-2.json
@@ -178,8 +178,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-2",
+ "switch_port": "1/1/33",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-3.json b/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-3.json
index e63e0e25e74..591fa7f25f1 100644
--- a/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-3.json
+++ b/data/grid5000/sites/sophia/clusters/esterel10/nodes/esterel10-3.json
@@ -161,8 +161,8 @@
"rate": 1000000000,
"sriov": false,
"sriov_totalvfs": 0,
- "switch": null,
- "switch_port": null,
+ "switch": "sw-2",
+ "switch_port": "1/1/34",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-2.json b/data/grid5000/sites/sophia/network_equipments/sw-2.json
index b9d57e813cf..0927e9ee665 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-2.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-2.json
@@ -111,10 +111,22 @@
{
},
{
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "1/1/33",
+ "uid": "esterel10-2"
},
{
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "1/1/34",
+ "uid": "esterel10-3"
},
{
+ "kind": "node",
+ "port": "eth1",
+ "snmp_name": "1/1/35",
+ "uid": "esterel10-1"
},
{
"kind": "node",
diff --git a/input/grid5000/sites/sophia/networks/sw-2.yaml b/input/grid5000/sites/sophia/networks/sw-2.yaml
index 75521c76aa1..1d305ed5bd5 100644
--- a/input/grid5000/sites/sophia/networks/sw-2.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-2.yaml
@@ -50,6 +50,15 @@ sw-2:
27:
uid: srv-data
kind: server
+ 33:
+ uid: esterel10-2
+ port: eth1
+ 34:
+ uid: esterel10-3
+ port: eth1
+ 35:
+ uid: esterel10-1
+ port: eth1
36:
uid: esterel41-1
40:
@@ -61,4 +70,4 @@ sw-2:
49:
uid: gw
kind: router
- rate: 10000000000
\ No newline at end of file
+ rate: 10000000000
--
GitLab