From b342571d8f70014c6e1ae1fc75242c89e10e4191 Mon Sep 17 00:00:00 2001 From: Nathan Paulin <nathan.paulin@inria.fr> Date: Wed, 9 Apr 2025 12:53:44 +0200 Subject: [PATCH] [grenoble][chartreuse4] add network topology description in refrepo --- .../clusters/chartreuse4/nodes/chartreuse4-1.json | 4 ++-- .../network_equipments/imag-1b-F3-admin-01.json | 12 ++++++++++++ .../network_equipments/imag-1b-F3-prod-01.json | 5 +++++ .../sites/grenoble/networks/imag-1b-F3-admin-01.yaml | 12 ++++++++++++ .../sites/grenoble/networks/imag-1b-F3-prod-01.yaml | 3 +++ 5 files changed, 34 insertions(+), 2 deletions(-) diff --git a/data/grid5000/sites/grenoble/clusters/chartreuse4/nodes/chartreuse4-1.json b/data/grid5000/sites/grenoble/clusters/chartreuse4/nodes/chartreuse4-1.json index df8e4fb23b6..a1828eb2bfe 100644 --- a/data/grid5000/sites/grenoble/clusters/chartreuse4/nodes/chartreuse4-1.json +++ b/data/grid5000/sites/grenoble/clusters/chartreuse4/nodes/chartreuse4-1.json @@ -51,8 +51,8 @@ "name": "enp1s0f0np0", "network_address": "chartreuse4-1.grenoble.grid5000.fr", "rate": 10000000000, - "switch": null, - "switch_port": null + "switch": "imag-1b-F3-prod-01", + "switch_port": "1/1/16" }, { "device": "bmc", diff --git a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-admin-01.json b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-admin-01.json index 2765c5ef7dd..9c28f93a92b 100644 --- a/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-admin-01.json +++ b/data/grid5000/sites/grenoble/network_equipments/imag-1b-F3-admin-01.json @@ -37,12 +37,24 @@ { }, { + "kind": "other", + "snmp_name": "1/1/13", + "uid": "chartreuse4-1-bmc" }, { + "kind": "other", + "snmp_name": "1/1/14", + "uid": "chartreuse4-2-bmc" }, { + "kind": "other", + "snmp_name": "1/1/15", + "uid": "chartreuse4-3-bmc" }, { + "kind": "other", + "snmp_name": "1/1/16", + "uid": "chartreuse4-4-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 e20fdc6efe5..e486b434c53 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 @@ -99,6 +99,11 @@ { }, { + "kind": "node", + "port": "eth0", + "rate": 10000000000, + "snmp_name": "1/1/16", + "uid": "chartreuse4-1" }, { }, diff --git a/input/grid5000/sites/grenoble/networks/imag-1b-F3-admin-01.yaml b/input/grid5000/sites/grenoble/networks/imag-1b-F3-admin-01.yaml index 97cbe6f756e..714b99da2e2 100644 --- a/input/grid5000/sites/grenoble/networks/imag-1b-F3-admin-01.yaml +++ b/input/grid5000/sites/grenoble/networks/imag-1b-F3-admin-01.yaml @@ -22,6 +22,18 @@ imag-1b-F3-admin-01: #40: # uid: imag-1b-F3-prod-01-mgmt # kind: switch + 13: + uid: chartreuse4-1-bmc + kind: other + 14: + uid: chartreuse4-2-bmc + kind: other + 15: + uid: chartreuse4-3-bmc + kind: other + 16: + uid: chartreuse4-4-bmc + kind: other 48: uid: imag-1b-F3-prod-01 kind: switch 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 744e97bbd89..73562a4df47 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 @@ -47,6 +47,9 @@ imag-1b-F3-prod-01: 12: uid: chartreuse3-1 rate: 10_000_000_000 + 16: + uid: chartreuse4-1 + rate: 10_000_000_000 22: uid: nessie-1 39: -- GitLab