From 5e3d7c51f9619f54bf6bae573ea43f6459cf2519 Mon Sep 17 00:00:00 2001
From: Hugo Dominois <hugo.dominois@inria.fr>
Date: Wed, 9 Apr 2025 10:49:30 +0200
Subject: [PATCH] [sophia][esterel22] Second g5k-checks-import and Dell
 warranty

---
 .../sites/sophia/clusters/esterel22/esterel22.json     |  6 +++---
 .../sophia/clusters/esterel22/nodes/esterel22-1.json   | 10 ++++------
 input/grid5000/dell-product-data.yaml                  |  6 ++++++
 .../sites/sophia/clusters/esterel22/esterel22.yaml     |  3 ---
 .../sophia/clusters/esterel22/nodes/esterel22-1.yaml   |  7 +++----
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/data/grid5000/sites/sophia/clusters/esterel22/esterel22.json b/data/grid5000/sites/sophia/clusters/esterel22/esterel22.json
index 33a37da92c8..33f9b78a809 100644
--- a/data/grid5000/sites/sophia/clusters/esterel22/esterel22.json
+++ b/data/grid5000/sites/sophia/clusters/esterel22/esterel22.json
@@ -3,7 +3,7 @@
   "created_at": "Wed, 09 Apr 2025 00:00:00 GMT",
   "exotic": false,
   "kavlan": false,
-  "manufactured_at": "1970-01-01",
+  "manufactured_at": "2019-10-07",
   "metrics": [
     {
       "description": "Default subset of metrics from Prometheus Node Exporter",
@@ -54,7 +54,7 @@
   "model": "Dell PowerEdge T640",
   "nodes_count": 1,
   "nodes_description": "2 CPUs Intel Xeon Gold 6240, 18 cores/CPU, 4 GPUs Quadro RTX 6000, 384GB RAM, 558GB HDD, 3575GB HDD, 1 x 1Gb Ethernet, 1 x 40Gb InfiniBand",
-  "priority": 197101,
+  "priority": 202010,
   "queues": [
     "admin",
     "testing"
@@ -62,5 +62,5 @@
   "redfish": true,
   "type": "cluster",
   "uid": "esterel22",
-  "warranty_end": "1970-01-01"
+  "warranty_end": "2026-10-08"
 }
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.json b/data/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.json
index 67d709fdba7..d885741be05 100644
--- a/data/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.json
+++ b/data/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.json
@@ -11,13 +11,13 @@
     "vendor": "Dell Inc.",
     "version": "2.23.0"
   },
-  "bmc_version": "7.00",
+  "bmc_version": "7.00.00.181",
   "chassis": {
-    "manufactured_at": "1970-01-01",
+    "manufactured_at": "2019-10-07",
     "manufacturer": "Dell Inc.",
     "name": "PowerEdge T640",
     "serial": "1D58RZ2",
-    "warranty_end": "1970-01-01"
+    "warranty_end": "2026-10-08"
   },
   "exotic": false,
   "gpu_devices": {
@@ -216,12 +216,10 @@
       "model": "MT27500 Family [ConnectX-3]",
       "mountable": true,
       "mounted": true,
-      "name": "ibp137s0",
+      "name": "ib0",
       "netmask": "255.255.240.0",
       "network_address": "esterel22-1-ib0.sophia.grid5000.fr",
       "rate": 40000000000,
-      "sriov": false,
-      "sriov_totalvfs": 0,
       "vendor": "Mellanox Technologies"
     },
     {
diff --git a/input/grid5000/dell-product-data.yaml b/input/grid5000/dell-product-data.yaml
index 6b9a796987b..83c2e2e57c1 100644
--- a/input/grid5000/dell-product-data.yaml
+++ b/input/grid5000/dell-product-data.yaml
@@ -2278,6 +2278,12 @@ sites:
             chassis:
               manufactured_at: 2016-05-04
               warranty_end: 2021-05-04
+      esterel22:
+        nodes:
+          esterel22-1:
+            chassis:
+              manufactured_at: 2019-10-07
+              warranty_end: 2026-10-08
       esterel24:
         nodes:
           esterel24-1:
diff --git a/input/grid5000/sites/sophia/clusters/esterel22/esterel22.yaml b/input/grid5000/sites/sophia/clusters/esterel22/esterel22.yaml
index 4dc9908f48b..991cb6b5858 100644
--- a/input/grid5000/sites/sophia/clusters/esterel22/esterel22.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel22/esterel22.yaml
@@ -9,9 +9,6 @@ queues:
   - testing
 nodes:
   esterel22-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
diff --git a/input/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.yaml b/input/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.yaml
index 8c5f57de423..28471e05571 100644
--- a/input/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.yaml
+++ b/input/grid5000/sites/sophia/clusters/esterel22/nodes/esterel22-1.yaml
@@ -11,7 +11,7 @@ esterel22-1:
     release_date: 01/09/2025
     vendor: Dell Inc.
     version: 2.23.0
-  bmc_version: '7.00'
+  bmc_version: 7.00.00.181
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge T640
@@ -122,13 +122,12 @@ esterel22-1:
       firmware_version: 2.42.5000
       guid: '0xb8599f0300a0d111'
       interface: InfiniBand
+      ip: 172.18.131.28
       mac: b8:59:9f:03:00:a0:d1:11
       management: false
       model: MT27500 Family [ConnectX-3]
-      name: ibp137s0
+      name: ib0
       rate: 40000000000
-      sriov: false
-      sriov_totalvfs: 0
       vendor: Mellanox Technologies
   operating_system:
     cstate_driver: intel_idle
-- 
GitLab