From 37a79c79cbd15d065b7403fe59a2917aec8d8d6c Mon Sep 17 00:00:00 2001
From: Jean-Camille Seck <jean-camille.seck@inria.fr>
Date: Wed, 30 Oct 2024 16:00:17 +0100
Subject: [PATCH] [lyon] temporary disabling ib on pyxis and gemini while swib
 is down Bug #16342

---
 data/grid5000/accesses/refrepo.json           | 20 +++++++++----------
 .../lyon/clusters/gemini/nodes/gemini-1.json  |  6 +++---
 .../lyon/clusters/gemini/nodes/gemini-2.json  |  6 +++---
 .../lyon/clusters/pyxis/nodes/pyxis-1.json    |  2 +-
 .../lyon/clusters/pyxis/nodes/pyxis-2.json    |  2 +-
 .../lyon/clusters/pyxis/nodes/pyxis-3.json    |  2 +-
 .../lyon/clusters/pyxis/nodes/pyxis-4.json    |  2 +-
 .../sites/lyon/clusters/gemini/gemini_ib.yaml |  6 +++---
 .../sites/lyon/clusters/pyxis/pyxis.yaml      |  2 ++
 9 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/data/grid5000/accesses/refrepo.json b/data/grid5000/accesses/refrepo.json
index 570584e09d5..234926bd0e8 100644
--- a/data/grid5000/accesses/refrepo.json
+++ b/data/grid5000/accesses/refrepo.json
@@ -23261,7 +23261,7 @@
                 {
                   "device": "ib0",
                   "driver": "mlx5_core",
-                  "enabled": true,
+                  "enabled": false,
                   "firmware_version": "16.26.4012",
                   "guid": "0x98039b03009266da",
                   "interface": "InfiniBand",
@@ -23281,7 +23281,7 @@
                 {
                   "device": "ib1",
                   "driver": "mlx5_core",
-                  "enabled": true,
+                  "enabled": false,
                   "firmware_version": "16.26.4012",
                   "guid": "0x98039b03009a3ac6",
                   "interface": "InfiniBand",
@@ -23299,7 +23299,7 @@
                 {
                   "device": "ib2",
                   "driver": "mlx5_core",
-                  "enabled": true,
+                  "enabled": false,
                   "firmware_version": "16.26.4012",
                   "guid": "0x98039b0300931f6e",
                   "interface": "InfiniBand",
@@ -23700,7 +23700,7 @@
                 {
                   "device": "ib0",
                   "driver": "mlx5_core",
-                  "enabled": true,
+                  "enabled": false,
                   "firmware_version": "16.26.4012",
                   "guid": "0x98039b03009a4a4e",
                   "interface": "InfiniBand",
@@ -23720,7 +23720,7 @@
                 {
                   "device": "ib1",
                   "driver": "mlx5_core",
-                  "enabled": true,
+                  "enabled": false,
                   "firmware_version": "16.26.4012",
                   "guid": "0x98039b03009a4a46",
                   "interface": "InfiniBand",
@@ -23738,7 +23738,7 @@
                 {
                   "device": "ib2",
                   "driver": "mlx5_core",
-                  "enabled": true,
+                  "enabled": false,
                   "firmware_version": "16.26.4012",
                   "guid": "0x98039b03009a2746",
                   "interface": "InfiniBand",
@@ -32680,7 +32680,7 @@
                 {
                   "device": "ib0",
                   "driver": "mlx5_core",
-                  "enabled": true,
+                  "enabled": false,
                   "firmware_version": "20.25.2006",
                   "guid": "0xb8599f0300d1f6f6",
                   "interface": "InfiniBand",
@@ -32891,7 +32891,7 @@
                 {
                   "device": "ib0",
                   "driver": "mlx5_core",
-                  "enabled": true,
+                  "enabled": false,
                   "firmware_version": "20.25.2006",
                   "guid": "0xb8599f0300d1f706",
                   "interface": "InfiniBand",
@@ -33102,7 +33102,7 @@
                 {
                   "device": "ib0",
                   "driver": "mlx5_core",
-                  "enabled": true,
+                  "enabled": false,
                   "firmware_version": "20.25.2006",
                   "guid": "0xb8599f0300d1f6f2",
                   "interface": "InfiniBand",
@@ -33313,7 +33313,7 @@
                 {
                   "device": "ib0",
                   "driver": "mlx5_core",
-                  "enabled": true,
+                  "enabled": false,
                   "firmware_version": "20.25.2006",
                   "guid": "0xb8599f0300d1fa66",
                   "interface": "InfiniBand",
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
index fad6aaa92aa..6e9f91add23 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-1.json
@@ -337,7 +337,7 @@
     {
       "device": "ib0",
       "driver": "mlx5_core",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "16.26.4012",
       "guid": "0x98039b03009266da",
       "interface": "InfiniBand",
@@ -357,7 +357,7 @@
     {
       "device": "ib1",
       "driver": "mlx5_core",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "16.26.4012",
       "guid": "0x98039b03009a3ac6",
       "interface": "InfiniBand",
@@ -375,7 +375,7 @@
     {
       "device": "ib2",
       "driver": "mlx5_core",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "16.26.4012",
       "guid": "0x98039b0300931f6e",
       "interface": "InfiniBand",
diff --git a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
index db6a4e6e96a..d5d9282a72a 100644
--- a/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
+++ b/data/grid5000/sites/lyon/clusters/gemini/nodes/gemini-2.json
@@ -337,7 +337,7 @@
     {
       "device": "ib0",
       "driver": "mlx5_core",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "16.26.4012",
       "guid": "0x98039b03009a4a4e",
       "interface": "InfiniBand",
@@ -357,7 +357,7 @@
     {
       "device": "ib1",
       "driver": "mlx5_core",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "16.26.4012",
       "guid": "0x98039b03009a4a46",
       "interface": "InfiniBand",
@@ -375,7 +375,7 @@
     {
       "device": "ib2",
       "driver": "mlx5_core",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "16.26.4012",
       "guid": "0x98039b03009a2746",
       "interface": "InfiniBand",
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json
index b7ebcd5a330..b423f066886 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-1.json
@@ -199,7 +199,7 @@
     {
       "device": "ib0",
       "driver": "mlx5_core",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "20.25.2006",
       "guid": "0xb8599f0300d1f6f6",
       "interface": "InfiniBand",
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json
index 5a5bba5bc9d..8d612d39690 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-2.json
@@ -199,7 +199,7 @@
     {
       "device": "ib0",
       "driver": "mlx5_core",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "20.25.2006",
       "guid": "0xb8599f0300d1f706",
       "interface": "InfiniBand",
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
index 2a1650e7db1..e1aefcebb3a 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-3.json
@@ -199,7 +199,7 @@
     {
       "device": "ib0",
       "driver": "mlx5_core",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "20.25.2006",
       "guid": "0xb8599f0300d1f6f2",
       "interface": "InfiniBand",
diff --git a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
index b0bf0a613bd..5ead1a13763 100644
--- a/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
+++ b/data/grid5000/sites/lyon/clusters/pyxis/nodes/pyxis-4.json
@@ -199,7 +199,7 @@
     {
       "device": "ib0",
       "driver": "mlx5_core",
-      "enabled": true,
+      "enabled": false,
       "firmware_version": "20.25.2006",
       "guid": "0xb8599f0300d1fa66",
       "interface": "InfiniBand",
diff --git a/input/grid5000/sites/lyon/clusters/gemini/gemini_ib.yaml b/input/grid5000/sites/lyon/clusters/gemini/gemini_ib.yaml
index a447cf6d2d4..a802e3007bb 100644
--- a/input/grid5000/sites/lyon/clusters/gemini/gemini_ib.yaml
+++ b/input/grid5000/sites/lyon/clusters/gemini/gemini_ib.yaml
@@ -3,16 +3,16 @@ nodes:
   gemini-[1-2]:
     network_adapters:
       ib0:
-        enabled: true
+        enabled: false
         mountable: true
         mounted: true
         netmask: 255.255.240.0
       ib1:
-        enabled: true
+        enabled: false
         mountable: true
         mounted: false
       ib2:
-        enabled: true
+        enabled: false
         mountable: true
         mounted: false
       ib3:
diff --git a/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml b/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
index bfe7dbc0f23..5b447c7430e 100644
--- a/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
+++ b/input/grid5000/sites/lyon/clusters/pyxis/pyxis.yaml
@@ -35,6 +35,8 @@ nodes:
         enabled: false
         mountable: false
         mounted: false
+      ib0:
+        enabled: false
     storage_devices:
       pci-0000:0f:00.0-sas-phy2-lun-0:
         interface: SATA
-- 
GitLab