From 8d9626ab8204d3b4280a2216ee4b3bf8d09cee38 Mon Sep 17 00:00:00 2001
From: Nathan Paulin <nathan.paulin@inria.fr>
Date: Wed, 2 Apr 2025 15:40:39 +0200
Subject: [PATCH] [grenoble][vercors3] add network topology description in
refrepo
---
.../grenoble/clusters/vercors3/nodes/vercors3-1.json | 4 ++--
.../grenoble/clusters/vercors3/nodes/vercors3-2.json | 4 ++--
.../network_equipments/imag-1b-F2-admin-01.json | 6 ++++++
.../network_equipments/imag-1b-F2-prod-01.json | 10 ++++++++++
.../sites/grenoble/networks/imag-1b-F2-admin-01.yaml | 6 ++++++
.../sites/grenoble/networks/imag-1b-F2-prod-01.yaml | 6 ++++++
6 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-1.json b/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-1.json
index a700f09e9df..058946939ac 100644
--- a/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-1.json
+++ b/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-1.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "vercors3-1.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "imag-1b-F2-prod-01",
+ "switch_port": "1/1/7"
},
{
"device": "bmc",
diff --git a/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-2.json b/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-2.json
index 3bbb686a47d..a06c7468bac 100644
--- a/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-2.json
+++ b/data/grid5000/sites/grenoble/clusters/vercors3/nodes/vercors3-2.json
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "vercors3-2.grenoble.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "imag-1b-F2-prod-01",
+ "switch_port": "1/1/8"
},
{
"device": "bmc",
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-admin-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-admin-01.json
index 24f334f25e9..232582a0b71 100644
--- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-admin-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-admin-01.json
@@ -21,8 +21,14 @@
{
},
{
+ "kind": "other",
+ "snmp_name": "1/1/5",
+ "uid": "vercors3-1-bmc"
},
{
+ "kind": "other",
+ "snmp_name": "1/1/6",
+ "uid": "vercors3-2-bmc"
},
{
},
diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json
index 2b7cd93e7a1..2ab54309353 100644
--- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json
+++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F2-prod-01.json
@@ -36,8 +36,18 @@
"uid": "vercors2-2"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "rate": 10000000000,
+ "snmp_name": "1/1/7",
+ "uid": "vercors3-1"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "rate": 10000000000,
+ "snmp_name": "1/1/8",
+ "uid": "vercors3-2"
},
{
},
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F2-admin-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F2-admin-01.yaml
index da4a4bdaf4e..e3ead1efc7c 100644
--- a/input/grid5000/sites/grenoble/networks/imag-1b-F2-admin-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F2-admin-01.yaml
@@ -16,6 +16,12 @@ imag-1b-F2-admin-01:
rate: 10_000_000_000
backplane_bps: 1_760_000_000_000
ports:
+ 5:
+ uid: vercors3-1-bmc
+ kind: other
+ 6:
+ uid: vercors3-2-bmc
+ kind: other
#40:
# uid: imag-1b-F1-prod-01-mgmt
# kind: switch
diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml
index 2828a4dec18..6bd2c7848b3 100644
--- a/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml
+++ b/input/grid5000/sites/grenoble/networks/imag-1b-F2-prod-01.yaml
@@ -23,6 +23,12 @@ imag-1b-F2-prod-01:
6:
uid: vercors2-2
rate: 1_000_000_000
+ 7:
+ uid: vercors3-1
+ rate: 10_000_000_000
+ 8:
+ uid: vercors3-2
+ rate: 10_000_000_000
44:
uid: imag-1b-F2-admin-01
kind: switch
--
GitLab