From a01a5da1a3760132bfc5327fa4bdd93fde3993c4 Mon Sep 17 00:00:00 2001
From: Nathan Paulin <nathan.paulin@inria.fr>
Date: Wed, 12 Mar 2025 11:14:31 +0100
Subject: [PATCH] [sophia][esterel2] add basic conf
---
.../sophia/clusters/esterel2/esterel2.json | 14 +++++++------
.../clusters/esterel2/nodes/esterel2-1.json | 16 +++++++--------
.../sites/sophia/network_equipments/sw-6.json | 4 ++++
.../sophia/network_equipments/swadmin-6.json | 3 +++
.../sophia/clusters/esterel2/esterel2.yaml | 20 +++++++++----------
.../grid5000/sites/sophia/networks/sw-6.yaml | 2 ++
.../sites/sophia/networks/swadmin-6.yaml | 3 +++
7 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/data/grid5000/sites/sophia/clusters/esterel2/esterel2.json b/data/grid5000/sites/sophia/clusters/esterel2/esterel2.json
index a3654eac965..265e265c717 100644
--- a/data/grid5000/sites/sophia/clusters/esterel2/esterel2.json
+++ b/data/grid5000/sites/sophia/clusters/esterel2/esterel2.json
@@ -1,9 +1,9 @@
{
- "boot_type": "uefi",
- "created_at": "Thu, 01 Jan 1970 00:00:00 GMT",
+ "boot_type": "bios",
+ "created_at": "Wed, 12 Mar 2025 00:00:00 GMT",
"exotic": false,
"kavlan": false,
- "manufactured_at": "1970-01-01",
+ "manufactured_at": "2016-05-04",
"metrics": [
{
"description": "Default subset of metrics from Prometheus Node Exporter",
@@ -78,8 +78,10 @@
}
}
],
- "model": "Cluster Model",
- "priority": 197001,
+ "model": "Dell PowerEdge T630",
+ "nodes_count": 1,
+ "nodes_description": "1 CPU Unknown vendor, 72 cores/CPU, 0GB RAM, 0GB SSD, 1 x 10Gb Ethernet",
+ "priority": 201605,
"queues": [
"admin",
"testing"
@@ -87,5 +89,5 @@
"redfish": true,
"type": "cluster",
"uid": "esterel2",
- "warranty_end": "1970-01-01"
+ "warranty_end": "2021-05-03"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json b/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json
index faec2349957..0748ef701d6 100644
--- a/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel2/nodes/esterel2-1.json
@@ -13,17 +13,17 @@
},
"bmc_version": "v1",
"chassis": {
- "manufactured_at": "1970-01-01",
+ "manufactured_at": "2016-05-04",
"manufacturer": "Unknown",
"name": "Unknown",
- "warranty_end": "1970-01-01"
+ "warranty_end": "2021-05-03"
},
"exotic": false,
"main_memory": {
"ram_size": 8
},
"management_tools": {
- "bmc_vendor_tool": "ipmitool",
+ "bmc_vendor_tool": "racadm",
"ipmitool": {
"retries": 5
}
@@ -51,8 +51,8 @@
"name": "enp1s0f0np0",
"network_address": "esterel2-1.sophia.grid5000.fr",
"rate": 10000000000,
- "switch": null,
- "switch_port": null
+ "switch": "sw-6",
+ "switch_port": "1/1/1"
},
{
"device": "bmc",
@@ -77,8 +77,8 @@
"turboboost_enabled": true
},
"performance": {
- "core_flops": 128,
- "node_flops": 9216
+ "core_flops": 38400000000,
+ "node_flops": 2764800000000
},
"processor": {
"cache_l1": null,
@@ -86,7 +86,7 @@
"cache_l1i": 8,
"cache_l2": 8,
"cache_l3": 8,
- "clock_speed": 8,
+ "clock_speed": 2400000000,
"ht_capable": true,
"instruction_set": "x86-64",
"microarchitecture": "Haswell",
diff --git a/data/grid5000/sites/sophia/network_equipments/sw-6.json b/data/grid5000/sites/sophia/network_equipments/sw-6.json
index af4c7525a37..fb1a37177aa 100644
--- a/data/grid5000/sites/sophia/network_equipments/sw-6.json
+++ b/data/grid5000/sites/sophia/network_equipments/sw-6.json
@@ -11,6 +11,10 @@
{
},
{
+ "kind": "node",
+ "port": "eth0",
+ "snmp_name": "1/1/1",
+ "uid": "esterel2-1"
},
{
},
diff --git a/data/grid5000/sites/sophia/network_equipments/swadmin-6.json b/data/grid5000/sites/sophia/network_equipments/swadmin-6.json
index 3bb0c06cd66..a1cb142f79c 100644
--- a/data/grid5000/sites/sophia/network_equipments/swadmin-6.json
+++ b/data/grid5000/sites/sophia/network_equipments/swadmin-6.json
@@ -48,6 +48,9 @@
{
},
{
+ "kind": "other",
+ "snmp_name": "1/1/9",
+ "uid": "esterel2-1-bmc"
},
{
},
diff --git a/input/grid5000/sites/sophia/clusters/esterel2/esterel2.yaml b/input/grid5000/sites/sophia/clusters/esterel2/esterel2.yaml
index bcf6b4b6411..ae640ca98c8 100644
--- a/input/grid5000/sites/sophia/clusters/esterel2/esterel2.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel2/esterel2.yaml
@@ -1,24 +1,24 @@
---
-model: Cluster Model # TODO: change this value.
-created_at: 1970-01-01 # TODO: change this value
+model: Dell PowerEdge T630
+created_at: 2025-03-12
kavlan: false
-boot_type: uefi # TODO: specify if 'uefi' (ideally) or 'bios' (legacy, if no other choice)
-exotic: false # TODO: specify if 'true' or 'false'
+boot_type: bios
+exotic: false
queues:
- admin
- testing
nodes:
esterel2-1:
chassis:
- manufactured_at: 1970-01-01 # TODO: Put date.
- warranty_end: 1970-01-01 # TODO: Put date.
+ manufactured_at: 2016-05-04
+ warranty_end: 2021-05-03
supported_job_types:
deploy: true
besteffort: true
max_walltime: 0
processor:
- microarchitecture: Haswell # TODO: replace with microarch name.
- clock_speed: 8 # TODO: Replace with clock speed.
+ microarchitecture: Haswell
+ clock_speed: 2_400_000_000
network_adapters:
bmc:
interface: Ethernet
@@ -35,7 +35,7 @@ nodes:
interface: SAS
by_path: "/dev/disk/by-path/dummy" # this path will have to change later.
software:
- standard-environment: debian11-x64-std # TODO: check that architecture is OK
+ standard-environment: debian11-x64-std
management_tools:
- bmc_vendor_tool: ipmitool # TODO: replace with bmc_vendor_tool (ipmitool, racadm)
+ bmc_vendor_tool: racadm
nodeset: esterel2
diff --git a/input/grid5000/sites/sophia/networks/sw-6.yaml b/input/grid5000/sites/sophia/networks/sw-6.yaml
index 83fc73c15e8..c59ae46fbc0 100644
--- a/input/grid5000/sites/sophia/networks/sw-6.yaml
+++ b/input/grid5000/sites/sophia/networks/sw-6.yaml
@@ -14,6 +14,8 @@ sw-6:
rate: 1000000000
kind: node
ports:
+ 1:
+ uid: esterel2-1
13:
uid: esterel1-1
14:
diff --git a/input/grid5000/sites/sophia/networks/swadmin-6.yaml b/input/grid5000/sites/sophia/networks/swadmin-6.yaml
index 7f02aff3c30..1f30d0d34be 100644
--- a/input/grid5000/sites/sophia/networks/swadmin-6.yaml
+++ b/input/grid5000/sites/sophia/networks/swadmin-6.yaml
@@ -35,6 +35,9 @@ swadmin-6:
7:
uid: esterel27-1-bmc
kind: other
+ 9:
+ uid: esterel2-1-bmc
+ kind: other
25:
uid: sw-6
kind: switch
--
GitLab