From 4e18df67f3cc405fed8517d806af5b2e315f7a76 Mon Sep 17 00:00:00 2001
From: Colin Regal-Mezin <colin.regal-mezin@inria.fr>
Date: Mon, 17 Mar 2025 17:28:32 +0100
Subject: [PATCH] [strasbourg][engelbourg] Update disk path of engelbourg
 cluster devices

---
 .../strasbourg/clusters/engelbourg/nodes/engelbourg-1.json  | 2 +-
 .../strasbourg/clusters/engelbourg/nodes/engelbourg-2.json  | 6 +++---
 .../strasbourg/clusters/engelbourg/nodes/engelbourg-3.json  | 6 +++---
 .../strasbourg/clusters/engelbourg/nodes/engelbourg-4.json  | 6 +++---
 .../strasbourg/clusters/engelbourg/nodes/engelbourg-5.json  | 6 +++---
 .../strasbourg/clusters/engelbourg/nodes/engelbourg-6.json  | 6 +++---
 .../strasbourg/clusters/engelbourg/nodes/engelbourg-7.json  | 6 +++---
 .../strasbourg/clusters/engelbourg/nodes/engelbourg-8.json  | 6 +++---
 .../sites/strasbourg/clusters/engelbourg/engelbourg.yaml    | 2 +-
 9 files changed, 23 insertions(+), 23 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 27823386baf..936d8aaa9f8 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-1.json
@@ -105,7 +105,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "id": "disk0",
       "interface": "SAS",
       "model": "unknown",
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 a48569fb71e..4d2b7190b93 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-2.json
@@ -51,8 +51,8 @@
       "name": "enp1s0f0np0",
       "network_address": "engelbourg-2.strasbourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null
+      "switch": "sw-core-adm",
+      "switch_port": "Ethernet44"
     },
     {
       "device": "bmc",
@@ -105,7 +105,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "id": "disk0",
       "interface": "SAS",
       "model": "unknown",
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 115e3f5a864..a4428167c5a 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-3.json
@@ -51,8 +51,8 @@
       "name": "enp1s0f0np0",
       "network_address": "engelbourg-3.strasbourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null
+      "switch": "sw-core-adm",
+      "switch_port": "Ethernet56"
     },
     {
       "device": "bmc",
@@ -105,7 +105,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "id": "disk0",
       "interface": "SAS",
       "model": "unknown",
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 1689e2014c5..064bb258c2e 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-4.json
@@ -51,8 +51,8 @@
       "name": "enp1s0f0np0",
       "network_address": "engelbourg-4.strasbourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null
+      "switch": "sw-core-adm",
+      "switch_port": "Ethernet68"
     },
     {
       "device": "bmc",
@@ -105,7 +105,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "id": "disk0",
       "interface": "SAS",
       "model": "unknown",
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 ac7a3575e5c..f3afd881040 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-5.json
@@ -51,8 +51,8 @@
       "name": "enp1s0f0np0",
       "network_address": "engelbourg-5.strasbourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null
+      "switch": "sw-core-adm",
+      "switch_port": "Ethernet80"
     },
     {
       "device": "bmc",
@@ -105,7 +105,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "id": "disk0",
       "interface": "SAS",
       "model": "unknown",
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 b2f53304cee..f18d67d7139 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-6.json
@@ -51,8 +51,8 @@
       "name": "enp1s0f0np0",
       "network_address": "engelbourg-6.strasbourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null
+      "switch": "sw-core-adm",
+      "switch_port": "Ethernet92"
     },
     {
       "device": "bmc",
@@ -105,7 +105,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "id": "disk0",
       "interface": "SAS",
       "model": "unknown",
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 bddd04c1fe0..e4d8a5a0a3b 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-7.json
@@ -51,8 +51,8 @@
       "name": "enp1s0f0np0",
       "network_address": "engelbourg-7.strasbourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null
+      "switch": "sw-core-adm",
+      "switch_port": "Ethernet104"
     },
     {
       "device": "bmc",
@@ -105,7 +105,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "id": "disk0",
       "interface": "SAS",
       "model": "unknown",
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 a30531f8b64..b68dfce5ea9 100644
--- a/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
+++ b/data/grid5000/sites/strasbourg/clusters/engelbourg/nodes/engelbourg-8.json
@@ -51,8 +51,8 @@
       "name": "enp1s0f0np0",
       "network_address": "engelbourg-8.strasbourg.grid5000.fr",
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null
+      "switch": "sw-core-adm",
+      "switch_port": "Ethernet116"
     },
     {
       "device": "bmc",
@@ -105,7 +105,7 @@
   "storage_devices": [
     {
       "by_id": "",
-      "by_path": "/dev/disk/by-path/dummy",
+      "by_path": "/dev/disk/by-path/pci-0000:00:1f.2-ata-1",
       "id": "disk0",
       "interface": "SAS",
       "model": "unknown",
diff --git a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
index 4d4aea069e5..26338b6b94a 100644
--- a/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
+++ b/input/grid5000/sites/strasbourg/clusters/engelbourg/engelbourg.yaml
@@ -32,7 +32,7 @@ nodes:
       disk0: # This field will have to be renamed later.
         id: disk0
         interface: SAS
-        by_path: "/dev/disk/by-path/dummy" # this path will have to change later.
+        by_path: "/dev/disk/by-path/pci-0000:00:1f.2-ata-1"
     software:
       standard-environment: debian11-x64-std # TODO: check that architecture is OK
     management_tools:
-- 
GitLab