From 92ee914ba3169dd4e95f096516b366c3249b581a Mon Sep 17 00:00:00 2001
From: Hugo Dominois <hugo.dominois@inria.fr>
Date: Mon, 24 Mar 2025 13:54:54 +0100
Subject: [PATCH] [sophia][esterel26] Add cluster information

---
 .../sophia/clusters/esterel26/esterel26.json  |  4 +--
 .../clusters/esterel26/nodes/esterel26-1.json | 14 +++++------
 input/grid5000/dell-product-data.yaml         |  6 +++++
 .../sophia/clusters/esterel26/esterel26.yaml  | 25 ++++++++-----------
 4 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/data/grid5000/sites/sophia/clusters/esterel26/esterel26.json b/data/grid5000/sites/sophia/clusters/esterel26/esterel26.json
index 540da190de6..74980ff3f01 100644
--- a/data/grid5000/sites/sophia/clusters/esterel26/esterel26.json
+++ b/data/grid5000/sites/sophia/clusters/esterel26/esterel26.json
@@ -1,6 +1,6 @@
 {
   "boot_type": "uefi",
-  "created_at": "Thu, 01 Jan 1970 00:00:00 GMT",
+  "created_at": "Tue, 25 Mar 2025 00:00:00 GMT",
   "exotic": false,
   "kavlan": false,
   "manufactured_at": "1970-01-01",
@@ -51,7 +51,7 @@
       }
     }
   ],
-  "model": "Cluster Model",
+  "model": "Dell PowerEdge T640",
   "nodes_count": 1,
   "nodes_description": "2 CPUs Intel Xeon Silver 4216, 16 cores/CPU, 384GB RAM, 558GB HDD, 3575GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
   "priority": 197001,
diff --git a/data/grid5000/sites/sophia/clusters/esterel26/nodes/esterel26-1.json b/data/grid5000/sites/sophia/clusters/esterel26/nodes/esterel26-1.json
index 215e6ccb3f4..d6df3f3eef9 100644
--- a/data/grid5000/sites/sophia/clusters/esterel26/nodes/esterel26-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel26/nodes/esterel26-1.json
@@ -24,7 +24,7 @@
     "ram_size": 412316860416
   },
   "management_tools": {
-    "bmc_vendor_tool": "ipmitool",
+    "bmc_vendor_tool": "racadm",
     "ipmitool": {
       "retries": 5
     }
@@ -194,8 +194,8 @@
     "turboboost_enabled": true
   },
   "performance": {
-    "core_flops": 128,
-    "node_flops": 4096
+    "core_flops": 33600000000,
+    "node_flops": 1075200000000
   },
   "processor": {
     "cache_l1": null,
@@ -203,10 +203,10 @@
     "cache_l1i": 32768,
     "cache_l2": 1048576,
     "cache_l3": 23068672,
-    "clock_speed": 8,
+    "clock_speed": 2100000000,
     "ht_capable": true,
     "instruction_set": "x86-64",
-    "microarchitecture": "Haswell",
+    "microarchitecture": "Cascade Lake-SP",
     "microcode": "0x5003707",
     "model": "Intel Xeon",
     "other_description": "Intel(R) Xeon(R) Silver 4216 CPU @ 2.10GHz",
@@ -225,7 +225,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:0:0",
       "firmware_version": 4.3,
       "id": "disk0",
-      "interface": "SAS",
+      "interface": "RAID",
       "model": "PERC H730P Adp",
       "size": 599550590976,
       "storage": "HDD",
@@ -236,7 +236,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:19:00.0-scsi-0:2:1:0",
       "firmware_version": 4.3,
       "id": "disk1",
-      "interface": "SAS",
+      "interface": "RAID",
       "model": "PERC H730P Adp",
       "size": 3838627020800,
       "storage": "HDD",
diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml
index dff68ffa4c3..f1109449749 100644
--- a/input/grid5000/dell-product-data.yaml
+++ b/input/grid5000/dell-product-data.yaml
@@ -2238,6 +2238,12 @@ sites:
             chassis:
               manufactured_at: 2016-05-04
               warranty_end: 2021-05-04
+      esterel26:
+        nodes:
+          esterel26-1:
+            chassis:
+              manufactured_at: 2020-10-30
+              warranty_end: 2027-10-31
       esterel4:
         nodes:
           esterel4-1:
diff --git a/input/grid5000/sites/sophia/clusters/esterel26/esterel26.yaml b/input/grid5000/sites/sophia/clusters/esterel26/esterel26.yaml
index c3085221933..548b4eb6ac0 100644
--- a/input/grid5000/sites/sophia/clusters/esterel26/esterel26.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel26/esterel26.yaml
@@ -1,24 +1,21 @@
 ---
-model: Cluster Model # TODO: change this value.
-created_at: 1970-01-01 # TODO: change this value
+model: Dell PowerEdge T640
+created_at: 2025-03-25
 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: uefi 
+exotic: false 
 queues:
   - admin
   - testing
 nodes:
   esterel26-1:
-    chassis:
-      manufactured_at: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line.
-      warranty_end: 1970-01-01 # TODO: if not Dell vendor, put date. if Dell, use rake gen:dell-product-data after g5k-checks import, and remove this line.
     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: Cascade Lake-SP
+      clock_speed: 2100000000
     network_adapters:
       bmc:
         interface: Ethernet
@@ -43,14 +40,14 @@ nodes:
         mountable: true
         netmask: 255.255.240.0
     storage_devices:
-      pci-0000:19:00.0-scsi-0:2:0:0: # This field will have to be renamed later.
+      pci-0000:19:00.0-scsi-0:2:0:0: 
         id: disk0
-        interface: SAS
+        interface: RAID
       pci-0000:19:00.0-scsi-0:2:1:0:
         id: disk1
-        interface: SAS
+        interface: RAID
     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: esterel26
-- 
GitLab