From a8fb0b50bb75aa1f9f73edcbd7a4c1fe20365fd8 Mon Sep 17 00:00:00 2001
From: BERARD Benjamin <benjamin.berard@inria.fr>
Date: Tue, 19 Oct 2021 16:38:23 +0200
Subject: [PATCH] [nancy/gruss] fix interface for gruss storage devices

---
 data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json | 2 +-
 data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json | 2 +-
 data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json | 2 +-
 input/grid5000/disks.yaml                                   | 4 ++--
 input/grid5000/sites/nancy/clusters/gruss/gruss.yaml        | 6 ++++++
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json
index ea84f886b8f..10eb0852be5 100644
--- a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json
+++ b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-2.json
@@ -220,7 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
       "firmware_version": "DD02",
       "id": "disk0",
-      "interface": "SAS",
+      "interface": "SATA",
       "model": "HFS1T9G32FEH-BA1",
       "size": 1920383410176,
       "storage": "SSD",
diff --git a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json
index 81468e8f306..598efba9602 100644
--- a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json
+++ b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-3.json
@@ -220,7 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
       "firmware_version": "DD02",
       "id": "disk0",
-      "interface": "SAS",
+      "interface": "SATA",
       "model": "HFS1T9G32FEH-BA1",
       "size": 1920383410176,
       "storage": "SSD",
diff --git a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json
index 9b2481ad81a..cd4f8d592d4 100644
--- a/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json
+++ b/data/grid5000/sites/nancy/clusters/gruss/nodes/gruss-4.json
@@ -220,7 +220,7 @@
       "by_path": "/dev/disk/by-path/pci-0000:01:00.0-scsi-0:0:0:0",
       "firmware_version": "DD02",
       "id": "disk0",
-      "interface": "SAS",
+      "interface": "SATA",
       "model": "HFS1T9G32FEH-BA1",
       "size": 1920383410176,
       "storage": "SSD",
diff --git a/input/grid5000/disks.yaml b/input/grid5000/disks.yaml
index 395eec39884..7e05ab261f5 100644
--- a/input/grid5000/disks.yaml
+++ b/input/grid5000/disks.yaml
@@ -25,8 +25,6 @@ disk_vendor_model_mapping:
       - unknown
 
   SAS:
-    Sk Hynix: 
-      - HFS1T9G32FEH-BA1
     Hitachi:
       - HUS726040ALS210
     Seagate:
@@ -87,6 +85,8 @@ disk_vendor_model_mapping:
       - WDC WD2502ABYS-1
       - WDC WD2003FYYS-1
       - WDC WD1003FBYX-1
+    Sk Hynix:
+      - HFS1T9G32FEH-BA1
     Unknown:
       - unknown
 
diff --git a/input/grid5000/sites/nancy/clusters/gruss/gruss.yaml b/input/grid5000/sites/nancy/clusters/gruss/gruss.yaml
index 4d281000a37..cd928bc9519 100644
--- a/input/grid5000/sites/nancy/clusters/gruss/gruss.yaml
+++ b/input/grid5000/sites/nancy/clusters/gruss/gruss.yaml
@@ -37,6 +37,12 @@ nodes:
         enabled: false
         mountable: false
         mounted: false
+  gruss-[2-4]:
+    storage_devices:
+      pci-0000:01:00.0-scsi-0:0:0:0:
+        interface: SATA
+        id: disk0
+  gruss-1:
     storage_devices:
       pci-0000:01:00.0-scsi-0:0:0:0:
         interface: SAS
-- 
GitLab