From 08622b3e13019aed0325dec167bb04efec1515be Mon Sep 17 00:00:00 2001
From: Lucas Nussbaum <lucas.nussbaum@inria.fr>
Date: Tue, 18 Mar 2025 20:31:33 +0100
Subject: [PATCH] [vercors2] add network description
---
.../grenoble/clusters/vercors2/nodes/vercors2-1.json | 4 ++--
.../grenoble/clusters/vercors2/nodes/vercors2-2.json | 4 ++--
.../network_equipments/imag-1b-F2-prod-01.json | 11 +++++++++++
.../sites/grenoble/networks/imag-1b-F2-prod-01.yaml | 7 +++++++
4 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json
index 2a2de4c0cbb..929706ae7f7 100644
--- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json
+++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-1.json
@@ -107,8 +107,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": null,
- "switch_port": null,
+ "switch": "imag-1b-F2-prod-01",
+ "switch_port": "1/1/5",
"vendor": "Intel"
},
{
diff --git a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json
index d01d552f25f..f303b85af3f 100644
--- a/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json
+++ b/data/grid5000/sites/grenoble/clusters/vercors2/nodes/vercors2-2.json
@@ -107,8 +107,8 @@
"rate": 1000000000,
"sriov": true,
"sriov_totalvfs": 63,
- "switch": null,
- "switch_port": null,
+ "switch": "imag-1b-F2-prod-01",
+ "switch_port": "1/1/6",
"vendor": "Intel"
},
{
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 e64bee62735..2b7cd93e7a1 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
@@ -9,6 +9,7 @@
{
"backplane_bps": 4800000000000,
"kavlan_pattern": "%LINECARD%/1/%PORT%",
+ "kind": "node",
"ports": [
{
},
@@ -21,8 +22,18 @@
{
},
{
+ "kind": "node",
+ "port": "eth0",
+ "rate": 1000000000,
+ "snmp_name": "1/1/5",
+ "uid": "vercors2-1"
},
{
+ "kind": "node",
+ "port": "eth0",
+ "rate": 1000000000,
+ "snmp_name": "1/1/6",
+ "uid": "vercors2-2"
},
{
},
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 f2326319c62..2828a4dec18 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
@@ -15,7 +15,14 @@ imag-1b-F2-prod-01:
kavlan_pattern: "%LINECARD%/1/%PORT%"
rate: 25_000_000_000
backplane_bps: 4_800_000_000_000
+ kind: node
ports:
+ 5:
+ uid: vercors2-1
+ rate: 1_000_000_000
+ 6:
+ uid: vercors2-2
+ rate: 1_000_000_000
44:
uid: imag-1b-F2-admin-01
kind: switch
--
GitLab