From df2f9d68f9c689ce35734f02c4c32bd05aec3467 Mon Sep 17 00:00:00 2001
From: Lancelot Doan <lancelot.doan@inria.fr>
Date: Mon, 24 Mar 2025 09:31:19 +0100
Subject: [PATCH] [Grenoble][Chartreuse3] Add cluster to switch
---
.../chartreuse3/nodes/chartreuse3-1.json | 4 ++--
.../chartreuse3/nodes/chartreuse3-2.json | 4 ++--
.../chartreuse3/nodes/chartreuse3-3.json | 4 ++--
.../chartreuse3/nodes/chartreuse3-4.json | 4 ++--
.../imag-1b-F3-prod-01.json | 20 +++++++++++++++++++
.../grenoble/networks/imag-1b-F3-prod-01.yaml | 12 +++++++++++
6 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
index 9a1431acb65..9d334ca6dbf 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-1.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "chartreuse3-1.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "imag-1b-F3-prod-01",
+ "switch_port": "1/1/12"
},
{
"device": "bmc",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
index d5e05397cee..8af9036651e 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-2.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "chartreuse3-2.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "imag-1b-F3-prod-01",
+ "switch_port": "1/1/9"
},
{
"device": "bmc",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
index ab23d2304b1..2980d44b8f9 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-3.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "chartreuse3-3.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "imag-1b-F3-prod-01",
+ "switch_port": "1/1/10"
},
{
"device": "bmc",
diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
index 66bf1adc3a8..5281471e038 100644
--- a/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
+++ b/data/grid5000/sites/grenoble/clusters/chartreuse3/nodes/chartreuse3-4.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "chartreuse3-4.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "imag-1b-F3-prod-01",
+ "switch_port": "1/1/11"
},
{
"device": "bmc",
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
index 2e0e697d3dd..e20fdc6efe5 100644
--- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-prod-01.json
@@ -65,12 +65,32 @@
"uid": "chartreuse2-4"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "rate": 10000000000,
+ "snmp_name": "1/1/9",
+ "uid": "chartreuse3-2"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "rate": 10000000000,
+ "snmp_name": "1/1/10",
+ "uid": "chartreuse3-3"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "rate": 10000000000,
+ "snmp_name": "1/1/11",
+ "uid": "chartreuse3-4"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "rate": 10000000000,
+ "snmp_name": "1/1/12",
+ "uid": "chartreuse3-1"
},
{
},
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
index 71d1e0074e4..744e97bbd89 100644
--- a/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F3-prod-01.yaml
@@ -35,6 +35,18 @@ imag-1b-F3-prod-01:
8:
uid: chartreuse2-4
rate: 10_000_000_000
+ 9:
+ uid: chartreuse3-2
+ rate: 10_000_000_000
+ 10:
+ uid: chartreuse3-3
+ rate: 10_000_000_000
+ 11:
+ uid: chartreuse3-4
+ rate: 10_000_000_000
+ 12:
+ uid: chartreuse3-1
+ rate: 10_000_000_000
22:
uid: nessie-1
39:
--
GitLab