From 774901e78098d91b145aa194e25a332426245170 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Thu, 20 Mar 2025 15:12:42 +0100
Subject: [PATCH] [strasbourg][engelbourg] Add rake reference-api generated
file
---
.../engelbourg/nodes/engelbourg-1.json | 2 +-
.../engelbourg/nodes/engelbourg-2.json | 2 +-
.../engelbourg/nodes/engelbourg-3.json | 2 +-
.../engelbourg/nodes/engelbourg-4.json | 2 +-
.../engelbourg/nodes/engelbourg-5.json | 2 +-
.../engelbourg/nodes/engelbourg-6.json | 2 +-
.../engelbourg/nodes/engelbourg-7.json | 2 +-
.../engelbourg/nodes/engelbourg-8.json | 2 +-
.../fleckenstein/nodes/fleckenstein-1.json | 4 +-
.../fleckenstein/nodes/fleckenstein-10.json | 4 +-
.../fleckenstein/nodes/fleckenstein-2.json | 4 +-
.../fleckenstein/nodes/fleckenstein-3.json | 4 +-
.../fleckenstein/nodes/fleckenstein-4.json | 4 +-
.../fleckenstein/nodes/fleckenstein-5.json | 4 +-
.../fleckenstein/nodes/fleckenstein-6.json | 4 +-
.../fleckenstein/nodes/fleckenstein-7.json | 4 +-
.../fleckenstein/nodes/fleckenstein-8.json | 4 +-
.../fleckenstein/nodes/fleckenstein-9.json | 4 +-
.../strasbourg/network_equipments/gw.json | 143 ++++--------------
19 files changed, 60 insertions(+), 139 deletions(-)
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
index 2ab14637065..1869ca624d7 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
index cf9adb26ae8..6512c33a7e1 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
index 007b100d8f4..b2c2826b2d2 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
index 8b6321f149a..582850b7cbf 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
index cac9fa38f91..c4eef7004e1 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
index 570d49e5ebe..f62ffc8e616 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
index 027df9975b5..0be3085d407 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
index 3d8d7e1badd..5e0a6e5f72f 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -99,7 +99,7 @@
"redfish": true,
"software": {
"forced-deployment-timestamp": 202007300948,
- "postinstall-version": "1.2025021810",
+ "postinstall-version": "1.2025032008",
"standard-environment": "debian11-x64-std"
},
"storage_devices": [
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
index e54ae287433..e767ad76647 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-1.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet6",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet8",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
index 57c21d16936..b3be77f3ab9 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-10.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet33",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet35",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
index a432f0e2426..c58417b201d 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-2.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet9",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet11",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
index 63349973ae5..a5959e8beec 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-3.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet12",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet14",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
index e323ddf7978..cbfc12b86d5 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-4.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet15",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet17",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
index 7ac10a30879..adbd0d1e987 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-5.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet18",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet20",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
index b90e4fac263..7fc8578f191 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-6.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet21",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet23",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
index 9db29772b70..3c39d06cb5b 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-7.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet24",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet26",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
index 016220cf643..b12871d93e1 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-8.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet27",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet29",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
index 10879d0b756..e5da0deae93 100644
--- a/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
+++ b/data/grid5000/sites/strasbourg/clusters/fleckenstein/nodes/fleckenstein-9.json
@@ -131,7 +131,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 128,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet30",
"vendor": "Intel"
},
@@ -171,7 +171,7 @@
"rate": 25000000000,
"sriov": true,
"sriov_totalvfs": 64,
- "switch": "gw",
+ "switch": "sw-core-adm",
"switch_port": "Ethernet32",
"vendor": "Intel"
},
diff --git a/data/grid5000/sites/strasbourg/network_equipments/gw.json b/data/grid5000/sites/strasbourg/network_equipments/gw.json
index 2e8e0b056b2..10ff5e05eff 100644
--- a/data/grid5000/sites/strasbourg/network_equipments/gw.json
+++ b/data/grid5000/sites/strasbourg/network_equipments/gw.json
@@ -2,14 +2,6 @@
"alias": [
"gw-strasbourg"
],
- "channels": {
- "port-channel1": {
- "kind": "server",
- "port": "port-channel1",
- "rate": 50000000000,
- "uid": "srv-data"
- }
- },
"ip": "172.16.175.254",
"ip6": "2001:660:4406:a00::ffff:ffff",
"kind": "router",
@@ -21,177 +13,106 @@
"kind": "node",
"ports": [
{
- "kind": "channel",
+ "kind": "node",
+ "port": "strasbourg",
"snmp_name": "Ethernet0",
- "uid": "port-channel1"
+ "uid": "dev"
},
{
- "kind": "channel",
+ "kind": "node",
+ "port": "apornet",
"snmp_name": "Ethernet1",
- "uid": "port-channel1"
- },
- {
- "kind": "server",
- "snmp_name": "Ethernet2",
- "uid": "pve-1"
- },
- {
- "kind": "server",
- "snmp_name": "Ethernet3",
- "uid": "pve-2"
- },
- {
- },
- {
+ "uid": "dev"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet6",
- "uid": "fleckenstein-1"
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet8",
- "uid": "fleckenstein-1"
+ "snmp_name": "Ethernet2",
+ "uid": "stonet-1"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet9",
- "uid": "fleckenstein-2"
- },
- {
+ "snmp_name": "Ethernet3",
+ "uid": "ibat-1"
},
{
"kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet11",
- "uid": "fleckenstein-2"
+ "port": "net",
+ "snmp_name": "Ethernet4",
+ "uid": "wiki"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet12",
- "uid": "fleckenstein-3"
- },
- {
+ "snmp_name": "Ethernet5",
+ "uid": "strasbourg-1"
},
{
"kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet14",
- "uid": "fleckenstein-3"
+ "port": "www",
+ "snmp_name": "Ethernet6",
+ "uid": "dev"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet15",
- "uid": "fleckenstein-4"
+ "snmp_name": "Ethernet7",
+ "uid": "soknet-1"
},
{
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet17",
- "uid": "fleckenstein-4"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet18",
- "uid": "fleckenstein-5"
},
{
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet20",
- "uid": "fleckenstein-5"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet21",
- "uid": "fleckenstein-6"
},
{
},
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet23",
- "uid": "fleckenstein-6"
- },
- {
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet24",
- "uid": "fleckenstein-7"
- },
{
},
{
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet26",
- "uid": "fleckenstein-7"
},
{
- "kind": "node",
- "port": "eth0",
- "snmp_name": "Ethernet27",
- "uid": "fleckenstein-8"
},
{
},
{
"kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet29",
- "uid": "fleckenstein-8"
+ "port": "RENATER",
+ "snmp_name": "Ethernet19",
+ "uid": "PE"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet30",
- "uid": "fleckenstein-9"
- },
- {
- },
- {
- "kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet32",
- "uid": "fleckenstein-9"
+ "snmp_name": "Ethernet20",
+ "uid": "p4-1"
},
{
"kind": "node",
"port": "eth0",
- "snmp_name": "Ethernet33",
- "uid": "fleckenstein-10"
- },
- {
+ "snmp_name": "Ethernet21",
+ "uid": "p4-1"
},
{
"kind": "node",
- "port": "eth2",
- "snmp_name": "Ethernet35",
- "uid": "fleckenstein-10"
+ "port": "icube",
+ "snmp_name": "Ethernet22",
+ "uid": "pfsense"
}
],
- "rate": 25000000000,
+ "rate": 10000000000,
"snmp_pattern": "Ethernet%PORT%"
}
],
"managed_by_us": true,
- "model": "wedge100bf_32x",
- "serial": "AM26029251",
+ "model": "Juniper EX4600-40F",
"site": "strasbourg",
"snmp_community": "Unknown",
"type": "network_equipment",
--
GitLab