From 4696fc535bd1a2aee630aa0ddf35c39547a61d95 Mon Sep 17 00:00:00 2001
From: Vidal WATAT <vidal.watat@inria.fr>
Date: Mon, 25 Feb 2013 09:37:07 +0100
Subject: [PATCH] [sophia] - Fields added and modified, fix #4867 -

---
 .../clusters/helios/nodes/helios-1.json       |   2 +-
 .../clusters/helios/nodes/helios-10.json      |   2 +-
 .../clusters/helios/nodes/helios-11.json      |   2 +-
 .../clusters/helios/nodes/helios-12.json      |   2 +-
 .../clusters/helios/nodes/helios-13.json      |   2 +-
 .../clusters/helios/nodes/helios-14.json      |   2 +-
 .../clusters/helios/nodes/helios-15.json      |   2 +-
 .../clusters/helios/nodes/helios-16.json      |   2 +-
 .../clusters/helios/nodes/helios-17.json      |   2 +-
 .../clusters/helios/nodes/helios-18.json      |   2 +-
 .../clusters/helios/nodes/helios-19.json      |   2 +-
 .../clusters/helios/nodes/helios-2.json       |   2 +-
 .../clusters/helios/nodes/helios-20.json      |   2 +-
 .../clusters/helios/nodes/helios-21.json      |   2 +-
 .../clusters/helios/nodes/helios-22.json      |   2 +-
 .../clusters/helios/nodes/helios-23.json      |   2 +-
 .../clusters/helios/nodes/helios-24.json      |   2 +-
 .../clusters/helios/nodes/helios-25.json      |   2 +-
 .../clusters/helios/nodes/helios-26.json      |   2 +-
 .../clusters/helios/nodes/helios-27.json      |   2 +-
 .../clusters/helios/nodes/helios-28.json      |   2 +-
 .../clusters/helios/nodes/helios-29.json      |   2 +-
 .../clusters/helios/nodes/helios-3.json       |   2 +-
 .../clusters/helios/nodes/helios-30.json      |   2 +-
 .../clusters/helios/nodes/helios-31.json      |   2 +-
 .../clusters/helios/nodes/helios-32.json      |   2 +-
 .../clusters/helios/nodes/helios-33.json      |   2 +-
 .../clusters/helios/nodes/helios-34.json      |   2 +-
 .../clusters/helios/nodes/helios-35.json      |   2 +-
 .../clusters/helios/nodes/helios-36.json      |   2 +-
 .../clusters/helios/nodes/helios-37.json      |   2 +-
 .../clusters/helios/nodes/helios-38.json      |   2 +-
 .../clusters/helios/nodes/helios-39.json      |   2 +-
 .../clusters/helios/nodes/helios-4.json       |   2 +-
 .../clusters/helios/nodes/helios-40.json      |   2 +-
 .../clusters/helios/nodes/helios-41.json      |   2 +-
 .../clusters/helios/nodes/helios-42.json      |   2 +-
 .../clusters/helios/nodes/helios-43.json      |   2 +-
 .../clusters/helios/nodes/helios-44.json      |   2 +-
 .../clusters/helios/nodes/helios-45.json      |   2 +-
 .../clusters/helios/nodes/helios-46.json      |   2 +-
 .../clusters/helios/nodes/helios-47.json      |   2 +-
 .../clusters/helios/nodes/helios-48.json      |   2 +-
 .../clusters/helios/nodes/helios-49.json      |   2 +-
 .../clusters/helios/nodes/helios-5.json       |   2 +-
 .../clusters/helios/nodes/helios-50.json      |   2 +-
 .../clusters/helios/nodes/helios-51.json      |   2 +-
 .../clusters/helios/nodes/helios-52.json      |   2 +-
 .../clusters/helios/nodes/helios-53.json      |   2 +-
 .../clusters/helios/nodes/helios-54.json      |   2 +-
 .../clusters/helios/nodes/helios-55.json      |   2 +-
 .../clusters/helios/nodes/helios-56.json      |   2 +-
 .../clusters/helios/nodes/helios-6.json       |   2 +-
 .../clusters/helios/nodes/helios-7.json       |   2 +-
 .../clusters/helios/nodes/helios-8.json       |   2 +-
 .../clusters/helios/nodes/helios-9.json       |   2 +-
 .../sophia/clusters/sol/nodes/sol-1.json      |   4 +-
 .../sophia/clusters/sol/nodes/sol-10.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-11.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-12.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-13.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-14.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-15.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-16.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-17.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-18.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-19.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-2.json      |   4 +-
 .../sophia/clusters/sol/nodes/sol-20.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-21.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-22.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-23.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-24.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-25.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-26.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-27.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-28.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-29.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-3.json      |   4 +-
 .../sophia/clusters/sol/nodes/sol-30.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-31.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-32.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-33.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-34.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-35.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-36.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-37.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-38.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-39.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-4.json      |   4 +-
 .../sophia/clusters/sol/nodes/sol-40.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-41.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-42.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-43.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-44.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-45.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-46.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-47.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-48.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-49.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-5.json      |   4 +-
 .../sophia/clusters/sol/nodes/sol-50.json     |   4 +-
 .../sophia/clusters/sol/nodes/sol-6.json      |   4 +-
 .../sophia/clusters/sol/nodes/sol-7.json      |   4 +-
 .../sophia/clusters/sol/nodes/sol-8.json      |   4 +-
 .../sophia/clusters/sol/nodes/sol-9.json      |   4 +-
 .../sophia/clusters/suno/nodes/suno-1.json    |   2 +-
 .../sophia/clusters/suno/nodes/suno-10.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-11.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-12.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-13.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-14.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-15.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-16.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-17.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-18.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-19.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-2.json    |   2 +-
 .../sophia/clusters/suno/nodes/suno-20.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-21.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-22.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-23.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-24.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-25.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-26.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-27.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-28.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-29.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-3.json    |   2 +-
 .../sophia/clusters/suno/nodes/suno-30.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-31.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-32.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-33.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-34.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-35.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-36.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-37.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-38.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-39.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-4.json    |   2 +-
 .../sophia/clusters/suno/nodes/suno-40.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-41.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-42.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-43.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-44.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-45.json   |   2 +-
 .../sophia/clusters/suno/nodes/suno-5.json    |   2 +-
 .../sophia/clusters/suno/nodes/suno-6.json    |   2 +-
 .../sophia/clusters/suno/nodes/suno-7.json    |   2 +-
 .../sophia/clusters/suno/nodes/suno-8.json    |   2 +-
 .../sophia/clusters/suno/nodes/suno-9.json    |   2 +-
 .../input/sites/sophia/clusters/helios.rb     |   2 +-
 generators/input/sites/sophia/clusters/sol.rb |   2 +-
 .../input/sites/sophia/clusters/sol.yaml      | 100 +++++++++---------
 .../input/sites/sophia/clusters/suno.yaml     |  90 ++++++++--------
 155 files changed, 298 insertions(+), 298 deletions(-)

diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
index 302e6a9bc27..aed8834ce57 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-1-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
index 3225dba6e98..aa76a8a4338 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-10-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
index 125a782528a..67ad15e4210 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-11-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
index 5a6b0214d5c..a39bc85ff43 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-12-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
index d45c07354df..bb16457a1c6 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-13-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
index 74be237624e..95c136ab02d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-14-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
index ccba12d45eb..3efd0dfde06 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-15-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
index 557142c897d..22ff86ca2e6 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-16-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
index db0908772a0..c18df095291 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-17-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
index bb244ae411e..9ae82cdf82e 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-18-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
index 7bc3276d230..292d9290c91 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-19-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
index 22db3bcf14c..0fcc0b24ff3 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-2-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
index 047f55b5662..1b7322c7da6 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-20-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
index 661e518c23e..27397c9e66e 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-21-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
index 914f28f578b..d3b4e25d1a7 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-22-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
index 1cbc66b5ab6..6c611e210c3 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-23-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
index b3b59a4c3b4..cd557db408c 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-24-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
index cb1559a6308..2eb35556b09 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-25-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
index 44ad25d4b74..bb7ec0ec39e 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-26-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
index 4869a3674fc..4330678e304 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-27-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
index 65569edf8cc..87643775ca2 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-28-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
index 6d959c60a49..f87d07e190f 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-29-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
index 6a07e5805eb..abafbeeaa1f 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-3-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
index 945d6dbb652..a150d997df4 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-30-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
index 03315cf8ebb..9391fb63b3d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-31-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
index 59c2afd6eb5..82d5abb7e02 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-32-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
index 428160f0051..685075b0463 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-33-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
index 656be489d70..7b6d7b4e9c2 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-34-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
index 8649b411a5e..71b2696feb2 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-35-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
index c38c0dcdc29..54d88528316 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-36-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
index 8f548c49f1a..df957b6d391 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-37-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
index ed7820df012..e84ecc17931 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-38-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
index b0725212693..060993a636c 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-39-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
index 4c7c5c08b00..db75b1dd8da 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-4-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
index ee7b0c0995d..05b5fa9eee9 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-40-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
index ba231178591..51081c16c09 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-41-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
index b82e1062722..3300e6c9f41 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-42-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
index 9ff4689bd4d..f29e46b3ebf 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-43-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
index e3d4ce429fc..0c0aede3b3a 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-44-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
index bf12bc53e40..fd0767daf86 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-45-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
index 723b594055b..fd8a41917b1 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-46-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
index 20585c76a90..d424795b626 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-47-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
index 7cfb74f0600..786feae091b 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-48-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
index 20417d00f08..e657f4e2169 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-49-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
index 232dc1f365e..7ecc0bc4977 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-5-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
index e3a914b2cff..ff61abd9cdb 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-50-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
index 14fbfb0577e..8be643f95f8 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-51-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
index 73a3affe049..10ca95e518c 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-52-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
index 755b96f1d90..54a59c5d227 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-53-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
index e064dd30d0f..b6e021c4a00 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-54-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
index d0fb3089686..3783320308e 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-55-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
index a65856f6ae9..e5d1cdbefeb 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-56-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
index 7cc0d1b2f10..8783568099c 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-6-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
index 18e77d7519d..f5ea6b7edbe 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-7-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
index da0752bc322..0742480b196 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-8-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
index 3683f89f00a..c1db9e186ff 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
@@ -84,7 +84,7 @@
       "mounted": true,
       "network_address": "helios-9-myri0.sophia.grid5000.fr",
       "rate": 2000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
index 1db30991ebd..6265a0c34a6 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-1-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-1.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/1",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
index e9cbc5d001a..f7a324377c5 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-10-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-10.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/19",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
index cc91db8a638..c7d392148d9 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-11-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-11.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/21",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
index 732c9647221..1dbdbc12f5e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-12-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-12.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/23",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
index 7980635c912..61eeec412ac 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-13-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-13.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/1",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
index 9d3ef543d98..e5ad52d9372 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-14-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-14.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/3",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
index 7d3942e5093..eb61583d202 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-15-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-15.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/5",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
index 75050dc4e41..aa615e90677 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-16-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-16.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/7",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
index 9e98c869155..86cf9a60c7e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-17-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-17.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/9",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
index 56ad98e8a0a..221a1c7433d 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-18-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-18.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/11",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
index 142fb973bc7..c9c2362a583 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-19-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-19.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/13",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
index afbbd713135..aefc05e612d 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-2-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-2.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/3",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
index f0f4376eea9..33ac21393ff 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-20-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-20.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/15",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
index be737ebb3cc..d69d4a622f8 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-21-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-21.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/17",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
index ccc04e1e27f..caa61b7c5ea 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-22-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-22.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/19",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
index 95629de997a..c4f7a7613be 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-23-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-23.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/21",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
index 843abee9f50..ad13d5d4b52 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-24-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-24.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/23",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
index 24dabdcf702..7b99340abbd 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-25-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-25.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/2",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
index c43d4b80a66..d48bb4ab24a 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-26-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-26.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/4",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
index ed0d3124fca..2ba1230c6a6 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-27-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-27.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/6",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
index 81bcf985899..62081093279 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-28-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-28.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/8",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
index 8eca0e692e9..319c272b297 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-29-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-29.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/10",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
index dc53cfbfcdc..1ca5121cf64 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-3-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-3.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/5",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
index dce33460336..9c454b20761 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-30-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-30.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/12",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
index 097678218e4..a10ff75f74d 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-31-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-31.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/14",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
index 48e32a96b8c..8099c5d10f4 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-32-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-32.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/16",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
index 8ff1d043b5e..38368fadba7 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-33-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-33.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/18",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
index 54b17fd14ae..55cef5b3359 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-34-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-34.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/20",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
index 27b2a758595..9c732ce1d93 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-35-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-35.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/22",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
index e549c690e32..ad846193ace 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-36-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-36.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/24",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
index 8fa85b1b3b9..6933773da5a 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-37-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-37.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/2",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
index a3f3c5cd55e..d848ee00491 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-38-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-38.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/4",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
index 05af8c44233..fc43d0e511a 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-39-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-39.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/6",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
index f1e24e36d7d..ec7b793b080 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-4-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-4.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/7",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
index 3fc87328b8f..2162c5af6c6 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-40-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-40.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/8",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
index 4ab17cd25f0..b22b1d6b261 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-41-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-41.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/10",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
index c87ae8ccc19..ccbdda926d0 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-42-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-42.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/14",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
index 1e59948938b..580e49c5f5e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-43-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-43.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/12",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
index 6951e4c94f3..f4823790480 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-44-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-44.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/16",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
index f16b440c570..3e46f7d8f3b 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-45-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-45.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/18",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
index eae2c670dc6..c7c49890ad3 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-46-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-46.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/20",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
index 5b37c1a93e5..0e4352291f0 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-47-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-47.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/22",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
index f2404cf82d7..7991d3791d4 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-48-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-48.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "4/24",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
index daa9bc7c137..1a8087cda5c 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-49-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-49.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "9/1",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
index a6d52815d53..e5be6f59c8a 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-5-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-5.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/9",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
index 1b4ce54c213..3efe199e6f4 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-50-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-50.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "9/3",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
index f1006c0dc0c..a8427ecae04 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-6-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-6.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/11",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
index 30517205631..c38835631c3 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-7-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-7.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/13",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
index 28d9c945008..3b443a99304 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-8-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-8.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/15",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
index 3e6a4112664..1dbb3ce1deb 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
@@ -36,7 +36,7 @@
       "mounted": true,
       "network_address": "sol-9-myri0.sophia.grid5000.fr",
       "rate": 10000000000,
-      "switch": "edgeiron48gs",
+      "switch": "sw-myrinet",
       "vendor": "Myricom",
       "version": "M3F-PCIXF-2"
     },
@@ -53,7 +53,7 @@
       "mounted": true,
       "network_address": "sol-9.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "3/17",
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
index cd823b04e32..69b665e0297 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-1.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/10",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
index 0e5e416def4..6c8cdd4a133 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-10.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/3",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
index 7606c5c6806..7a1d2d23b83 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-11.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/2",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
index 9a4e4f09f62..50fdbdd3382 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-12.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/6",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
index a645be08297..652866cb228 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-13.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/13",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
index 724d260c39c..332d4edce49 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-14.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/19",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
index b64917d5989..b1a08ce5599 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-15.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/17",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
index 15b6568680b..1594dd14cb6 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-16.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/21",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
index 6984830cd98..fe5e9165b49 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-17.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/15",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
index 69dcafc8df2..07339c6b24b 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-18.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/1",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
index b0df2083247..653087149d3 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-19.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/2",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
index 58e93752ddf..270df876954 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-2.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/11",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
index a6116ddcf70..70a15aca030 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-20.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/3",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
index 743a8b908c6..813883e1638 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-21.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/4",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
index d6e46ba967a..028addd1796 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-22.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/5",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
index 254d4aefed2..7db43779d74 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-23.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/6",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
index 6b0bedbf8ea..6bdda0194f9 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-24.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/7",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
index 0692d34a289..369021799fe 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-25.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/8",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
index 7108976aaae..0f80ffd0d62 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-26.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/9",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
index 1d11938aafa..91661c83a0f 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-27.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/10",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
index 1da71dab979..c68f6ba4a87 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-28.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/11",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
index 7c1cb7fab7b..26b4a686422 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-29.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/12",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
index 916991c1425..cd3b8badc39 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-3.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/1",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
index 4b5f23a2927..f67da535351 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-30.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/13",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
index 57f6a18a535..5326f1d5759 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-31.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/14",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
index 57a9fae6bd4..b1c4b3a3b0a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-32.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/15",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
index 1c8a5f5f04d..9303a22f288 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-33.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/16",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
index f8487282268..ce8f4d1a7f3 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-34.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/17",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
index 6257a8bebb6..1de33ed9008 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-35.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "6/18",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
index cee714bd9bc..982ee61a476 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-36.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "7/1",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
index 2766ff60274..2653165edf4 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-37.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "7/2",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
index 16bef92f104..8534fae5cd1 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-38.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "7/3",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
index bd22b74f154..7d9fb60d7da 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-39.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "7/4",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
index 1610ba06573..2305c0ccb06 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-4.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/5",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
index 487e61fad9d..6e605bd8c6e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-40.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "7/5",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
index 45abfcfc7f3..63769f56660 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-41.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "7/6",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
index ea8c779d775..1f5ec3764b4 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-42.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "7/7",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
index f07cbdeb11b..d06ded42024 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-43.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "7/8",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
index 42b6e2e6cdb..8a44b4e9b57 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-44.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "7/9",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
index 4189e04374f..e23d2883d6a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-45.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "7/10",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
index 2f7c9eb4487..cda9a1838b3 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-5.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/4",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
index 65303b7179d..a0231b24171 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-6.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/7",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
index eff1af1396a..f50e501f8e3 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-7.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/8",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
index aad9c5f2734..a311411be0c 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-8.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/12",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
index 7b28e50eb98..eddec5f65b9 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
@@ -37,7 +37,7 @@
       "mounted": true,
       "network_address": "suno-9.sophia.grid5000.fr",
       "rate": 1000000000,
-      "switch": "FastIron",
+      "switch": "gw-sophia",
       "switch_port": "5/9",
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/generators/input/sites/sophia/clusters/helios.rb b/generators/input/sites/sophia/clusters/helios.rb
index c41989912de..3a1a7952c3d 100644
--- a/generators/input/sites/sophia/clusters/helios.rb
+++ b/generators/input/sites/sophia/clusters/helios.rb
@@ -113,7 +113,7 @@ site :sophia do |site_uid|
             :device => 'myri0',
             :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
             :ip => lookup('helios', node_uid, 'network_interfaces','myri0', 'ip'),
-            :switch => "edgeiron48gs"
+            :switch => "sw-myrinet"
           },{
             :interface => 'Ethernet',
             :rate => 100.M,
diff --git a/generators/input/sites/sophia/clusters/sol.rb b/generators/input/sites/sophia/clusters/sol.rb
index 24bbb04b367..0e96d1f4842 100644
--- a/generators/input/sites/sophia/clusters/sol.rb
+++ b/generators/input/sites/sophia/clusters/sol.rb
@@ -55,7 +55,7 @@ site :sophia do |site_uid|
              :vendor => 'Myricom',
              :version => "M3F-PCIXF-2",
              :driver => "mx",
-             :switch => "edgeiron48gs",
+             :switch => "sw-myrinet",
              :device => 'myri0',
              },
             {
diff --git a/generators/input/sites/sophia/clusters/sol.yaml b/generators/input/sites/sophia/clusters/sol.yaml
index 4fb5a1d38b4..3280bb447ec 100644
--- a/generators/input/sites/sophia/clusters/sol.yaml
+++ b/generators/input/sites/sophia/clusters/sol.yaml
@@ -17,7 +17,7 @@ sol-1:
     eth0:
       mac: 00:16:36:91:e7:d0
       ip: 138.96.22.1
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/1
     eth1:
       mac: 00:16:36:91:e7:d1
@@ -45,7 +45,7 @@ sol-2:
     eth0:
       mac: 00:16:36:91:eb:84
       ip: 138.96.22.2
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/3
     eth1:
       mac: 00:16:36:91:eb:85
@@ -73,7 +73,7 @@ sol-3:
     eth0:
       mac: 00:16:36:91:eb:24
       ip: 138.96.22.3
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/5
     eth1:
       mac: 00:16:36:91:eb:25
@@ -101,7 +101,7 @@ sol-4:
     eth0:
       mac: 00:16:36:91:e9:d4
       ip: 138.96.22.4
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/7
     eth1:
       mac: 00:16:36:91:e9:d5
@@ -129,7 +129,7 @@ sol-5:
     eth0:
       mac: 00:16:36:91:e8:e8
       ip: 138.96.22.5
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/9
     eth1:
       mac: 00:16:36:91:e8:e9
@@ -157,7 +157,7 @@ sol-6:
     eth0:
       mac: 00:16:36:91:e8:70
       ip: 138.96.22.6
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/11
     eth1:
       mac: 00:16:36:91:e8:71
@@ -185,7 +185,7 @@ sol-7:
     eth0:
       mac: 00:16:36:91:ea:d4
       ip: 138.96.22.7
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/13
     eth1:
       mac: 00:16:36:91:ea:d5
@@ -213,7 +213,7 @@ sol-8:
     eth0:
       mac: 00:16:36:c5:8a:87
       ip: 138.96.22.8
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/15
     eth1:
       mac: 00:16:36:c5:8a:88
@@ -241,7 +241,7 @@ sol-9:
     eth0:
       mac: 00:16:36:91:e9:90
       ip: 138.96.22.9
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/17
     eth1:
       mac: 00:16:36:91:e9:91
@@ -269,7 +269,7 @@ sol-10:
     eth0:
       mac: 00:16:36:91:eb:d0
       ip: 138.96.22.10
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/19
     eth1:
       mac: 00:16:36:91:eb:d1
@@ -297,7 +297,7 @@ sol-11:
     eth0:
       mac: 00:16:36:91:e9:dc
       ip: 138.96.22.11
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/21
     eth1:
       mac: 00:16:36:91:e9:dd
@@ -325,7 +325,7 @@ sol-12:
     eth0:
       mac: 00:16:36:91:eb:60
       ip: 138.96.22.12
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/23
     eth1:
       mac: 00:16:36:91:eb:61
@@ -353,7 +353,7 @@ sol-13:
     eth0:
       mac: 00:16:36:91:e8:5c
       ip: 138.96.22.13
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/1
     eth1:
       mac: 00:16:36:91:e8:5d
@@ -381,7 +381,7 @@ sol-14:
     eth0:
       mac: 00:16:36:c9:fb:e4
       ip: 138.96.22.14
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/3
     eth1:
       mac: 00:16:36:c9:fb:e5
@@ -409,7 +409,7 @@ sol-15:
     eth0:
       mac: 00:16:36:c9:fb:34
       ip: 138.96.22.15
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/5
     eth1:
       mac: 00:16:36:c9:fb:35
@@ -437,7 +437,7 @@ sol-16:
     eth0:
       mac: 00:16:36:c9:fb:94
       ip: 138.96.22.16
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/7
     eth1:
       mac: 00:16:36:c9:fb:95
@@ -465,7 +465,7 @@ sol-17:
     eth0:
       mac: 00:16:36:c5:8a:83
       ip: 138.96.22.17
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/9
     eth1:
       mac: 00:16:36:c5:8a:84
@@ -493,7 +493,7 @@ sol-18:
     eth0:
       mac: 00:16:36:91:ec:14
       ip: 138.96.22.18
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/11
     eth1:
       mac: 00:16:36:91:ec:15
@@ -521,7 +521,7 @@ sol-19:
     eth0:
       mac: 00:16:36:91:ea:c0
       ip: 138.96.22.19
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/13
     eth1:
       mac: 00:16:36:91:ea:c1
@@ -549,7 +549,7 @@ sol-20:
     eth0:
       mac: 00:16:36:91:e9:74
       ip: 138.96.22.20
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/15
     eth1:
       mac: 00:16:36:91:e9:75
@@ -577,7 +577,7 @@ sol-21:
     eth0:
       mac: 00:16:36:91:ec:24
       ip: 138.96.22.21
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/17
     eth1:
       mac: 00:16:36:91:ec:25
@@ -605,7 +605,7 @@ sol-22:
     eth0:
       mac: 00:16:36:91:e9:d8
       ip: 138.96.22.22
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/19
     eth1:
       mac: 00:16:36:91:e9:d9
@@ -633,7 +633,7 @@ sol-23:
     eth0:
       mac: 00:16:36:91:eb:1c
       ip: 138.96.22.23
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/21
     eth1:
       mac: 00:16:36:91:eb:1d
@@ -661,7 +661,7 @@ sol-24:
     eth0:
       mac: 00:16:36:91:e9:ec
       ip: 138.96.22.24
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/23
     eth1:
       mac: 00:16:36:91:e9:ed
@@ -689,7 +689,7 @@ sol-25:
     eth0:
       mac: 00:16:36:91:eb:2c
       ip: 138.96.22.25
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/2
     eth1:
       mac: 00:16:36:91:eb:2d
@@ -717,7 +717,7 @@ sol-26:
     eth0:
       mac: 00:16:36:91:eb:d4
       ip: 138.96.22.26
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/4
     eth1:
       mac: 00:16:36:91:eb:d5
@@ -745,7 +745,7 @@ sol-27:
     eth0:
       mac: 00:16:36:91:e9:f0
       ip: 138.96.22.27
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/6
     eth1:
       mac: 00:16:36:91:e9:f1
@@ -773,7 +773,7 @@ sol-28:
     eth0:
       mac: 00:16:36:91:e8:2c
       ip: 138.96.22.28
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/8
     eth1:
       mac: 00:16:36:91:e8:2d
@@ -801,7 +801,7 @@ sol-29:
     eth0:
       mac: 00:16:36:91:e8:dc
       ip: 138.96.22.29
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/10
     eth1:
       mac: 00:16:36:91:e8:dd
@@ -832,7 +832,7 @@ sol-30:
     eth0:
       mac: 00:16:36:91:ea:94
       ip: 138.96.22.30
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/12
     eth1:
       mac: 00:16:36:91:ea:95
@@ -863,7 +863,7 @@ sol-31:
     eth0:
       mac: 00:16:36:c9:f9:80
       ip: 138.96.22.31
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/14
     eth1:
       mac: 00:16:36:c9:f9:81
@@ -894,7 +894,7 @@ sol-32:
     eth0:
       mac: 00:16:36:91:e9:94
       ip: 138.96.22.32
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/16
     eth1:
       mac: 00:16:36:91:e9:95
@@ -925,7 +925,7 @@ sol-33:
     eth0:
       mac: 00:16:36:91:ea:84
       ip: 138.96.22.33
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/18
     eth1:
       mac: 00:16:36:91:ea:85
@@ -956,7 +956,7 @@ sol-34:
     eth0:
       mac: 00:16:36:91:eb:dc
       ip: 138.96.22.34
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/20
     eth1:
       mac: 00:16:36:91:eb:dd
@@ -987,7 +987,7 @@ sol-35:
     eth0:
       mac: 00:16:36:91:ea:08
       ip: 138.96.22.35
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/22
     eth1:
       mac: 00:16:36:91:ea:09
@@ -1018,7 +1018,7 @@ sol-36:
     eth0:
       mac: 00:16:36:91:ea:08
       ip: 138.96.22.36
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 3/24
     eth1:
       mac: 00:16:36:91:ea:09
@@ -1048,7 +1048,7 @@ sol-37:
     eth0:
       mac: 00:16:36:91:e9:a4
       ip: 138.96.22.37
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/2
     eth1:
       mac: 00:16:36:91:e9:a5
@@ -1079,7 +1079,7 @@ sol-38:
     eth0:
       mac: 00:16:36:91:e8:6c
       ip: 138.96.22.38
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/4
     eth1:
       mac: 00:16:36:91:e8:6d
@@ -1110,7 +1110,7 @@ sol-39:
     eth0:
       mac: 00:16:36:91:ec:20
       ip: 138.96.22.39
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/6
     eth1:
       mac: 00:16:36:91:ec:21
@@ -1141,7 +1141,7 @@ sol-40:
     eth0:
       mac: 00:16:36:91:eb:08
       ip: 138.96.22.40
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/8
     eth1:
       mac: 00:16:36:91:eb:09
@@ -1171,7 +1171,7 @@ sol-41:
     eth0:
       mac: 00:16:36:91:ea:f8
       ip: 138.96.22.41
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/10
     eth1:
       mac: 00:16:36:91:ea:f9
@@ -1202,7 +1202,7 @@ sol-42:
     eth0:
       mac: 00:16:36:91:ea:90
       ip: 138.96.22.42
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/14
     eth1:
       mac: 00:16:36:91:ea:91
@@ -1233,7 +1233,7 @@ sol-43:
     eth0:
       mac: 00:16:36:91:ea:fc
       ip: 138.96.22.43
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/12
     eth1:
       mac: 00:16:36:91:ea:fd
@@ -1264,7 +1264,7 @@ sol-44:
     eth0:
       mac: 00:16:36:91:e9:18
       ip: 138.96.22.44
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/16
     eth1:
       mac: 00:16:36:91:e9:19
@@ -1295,7 +1295,7 @@ sol-45:
     eth0:
       mac: 00:16:36:91:e9:58
       ip: 138.96.22.45
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/18
     eth1:
       mac: 00:16:36:91:e9:59
@@ -1326,7 +1326,7 @@ sol-46:
     eth0:
       mac: 00:16:36:91:eb:80
       ip: 138.96.22.46
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/20
     eth1:
       mac: 00:16:36:91:eb:81
@@ -1357,7 +1357,7 @@ sol-47:
     eth0:
       mac: 00:16:36:e9:26:c6
       ip: 138.96.22.47
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/22
     eth1:
       mac: 00:16:36:e9:26:c7
@@ -1388,7 +1388,7 @@ sol-48:
     eth0:
       mac: 00:16:36:91:eb:28
       ip: 138.96.22.48
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 4/24
     eth1:
       mac: 00:16:36:91:eb:29
@@ -1419,7 +1419,7 @@ sol-49:
     eth0:
       mac: 00:16:36:c5:89:17
       ip: 138.96.22.49
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 9/1
     eth1:
       mac: 00:16:36:c5:89:18
@@ -1450,7 +1450,7 @@ sol-50:
     eth0:
       mac: 00:16:36:91:e9:e0
       ip: 138.96.22.50
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 9/3
     eth1:
       mac: 00:16:36:91:e9:e1
diff --git a/generators/input/sites/sophia/clusters/suno.yaml b/generators/input/sites/sophia/clusters/suno.yaml
index 750c22734d7..3956aa3f812 100644
--- a/generators/input/sites/sophia/clusters/suno.yaml
+++ b/generators/input/sites/sophia/clusters/suno.yaml
@@ -16,7 +16,7 @@ suno-1:
     eth0:
       mac: 00:26:b9:58:e6:82
       ip: 138.96.21.101
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/10
     eth1:
       mac: 00:26:b9:58:e6:83
@@ -42,7 +42,7 @@ suno-2:
     eth0:
       mac: 00:26:b9:3f:49:38
       ip: 138.96.21.102
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/11
     eth1:
       mac: 00:26:b9:3f:49:39
@@ -68,7 +68,7 @@ suno-3:
     eth0:
       mac: 00:26:b9:3f:4a:5e
       ip: 138.96.21.103
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/1
     eth1:
       mac: 00:26:b9:3f:4a:5f
@@ -94,7 +94,7 @@ suno-4:
     eth0:
       mac: 00:26:b9:3f:4a:6d
       ip: 138.96.21.104
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/5
     eth1:
       mac: 00:26:b9:3f:4a:6e
@@ -120,7 +120,7 @@ suno-5:
     eth0:
       mac: 00:26:b9:3e:e8:58
       ip: 138.96.21.105
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/4
     eth1:
       mac: 00:26:b9:3e:e8:59
@@ -146,7 +146,7 @@ suno-6:
     eth0:
       mac: 00:26:b9:3f:40:af
       ip: 138.96.21.106
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/7
     eth1:
       mac: 00:26:b9:3f:40:b0
@@ -172,7 +172,7 @@ suno-7:
     eth0:
       mac: 00:26:b9:3f:43:a1
       ip: 138.96.21.107
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/8
     eth1:
       mac: 00:26:b9:3f:43:a2
@@ -198,7 +198,7 @@ suno-8:
     eth0:
       mac: 00:26:b9:3f:4a:3d
       ip: 138.96.21.108
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/12
     eth1:
       mac: 00:26:b9:3f:4a:3e
@@ -224,7 +224,7 @@ suno-9:
     eth0:
       mac: 00:26:b9:3f:41:27
       ip: 138.96.21.109
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/9
     eth1:
       mac: 00:26:b9:3f:41:28
@@ -250,7 +250,7 @@ suno-10:
     eth0:
       mac: 00:26:b9:3f:49:65
       ip: 138.96.21.110
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/3
     eth1:
       mac: 00:26:b9:3f:49:66
@@ -276,7 +276,7 @@ suno-11:
     eth0:
       mac: 00:26:b9:3f:47:0c
       ip: 138.96.21.111
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/2
     eth1:
       mac: 00:26:b9:3f:47:0d
@@ -302,7 +302,7 @@ suno-12:
     eth0:
       mac: 00:26:b9:3f:49:5c
       ip: 138.96.21.112
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/6
     eth1:
       mac: 00:26:b9:3f:49:5d
@@ -328,7 +328,7 @@ suno-13:
     eth0:
       mac: 00:26:b9:3f:4c:78
       ip: 138.96.21.113
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/13
     eth1:
       mac: 00:26:b9:3f:4c:79
@@ -354,7 +354,7 @@ suno-14:
     eth0:
       mac: 00:26:b9:3f:4a:61
       ip: 138.96.21.114
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/19
     eth1:
       mac: 00:26:b9:3f:4a:62
@@ -380,7 +380,7 @@ suno-15:
     eth0:
       mac: 00:26:b9:3f:44:89
       ip: 138.96.21.115
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/17
     eth1:
       mac: 00:26:b9:3f:44:8a
@@ -406,7 +406,7 @@ suno-16:
     eth0:
       mac: 00:26:b9:3f:41:0c
       ip: 138.96.21.116
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/21
     eth1:
       mac: 00:26:b9:3f:41:0d
@@ -432,7 +432,7 @@ suno-17:
     eth0:
       mac: 00:26:b9:3f:47:db
       ip: 138.96.21.117
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 5/15
     eth1:
       mac: 00:26:b9:3f:47:dc
@@ -458,7 +458,7 @@ suno-18:
     eth0:
       mac: 00:26:b9:35:c4:83
       ip: 138.96.21.118
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/1
     eth1:
       mac: 00:26:b9:35:c4:84
@@ -484,7 +484,7 @@ suno-19:
     eth0:
       mac: 00:26:b9:3f:40:67
       ip: 138.96.21.119
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/2
     eth1:
       mac: 00:26:b9:3f:40:68
@@ -510,7 +510,7 @@ suno-20:
     eth0:
       mac: 00:26:b9:3f:46:12
       ip: 138.96.21.120
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/3
     eth1:
       mac: 00:26:b9:3f:46:13
@@ -536,7 +536,7 @@ suno-21:
     eth0:
       mac: 00:26:b9:3f:3f:fb
       ip: 138.96.21.121
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/4
     eth1:
       mac: 00:26:b9:3f:3f:fc
@@ -562,7 +562,7 @@ suno-22:
     eth0:
       mac: 00:26:b9:3f:47:66
       ip: 138.96.21.122
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/5
     eth1:
       mac: 00:26:b9:3f:47:67
@@ -588,7 +588,7 @@ suno-23:
     eth0:
       mac: 00:26:b9:3f:4a:dc
       ip: 138.96.21.123
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/6
     eth1:
       mac: 00:26:b9:3f:4a:dd
@@ -614,7 +614,7 @@ suno-24:
     eth0:
       mac: 00:26:b9:3f:47:b4
       ip: 138.96.21.124
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/7
     eth1:
       mac: 00:26:b9:3f:47:b5
@@ -640,7 +640,7 @@ suno-25:
     eth0:
       mac: 00:26:b9:3f:47:a2
       ip: 138.96.21.125
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/8
     eth1:
       mac: 00:26:b9:3f:47:a3
@@ -666,7 +666,7 @@ suno-26:
     eth0:
       mac: 00:26:b9:3f:4b:4d
       ip: 138.96.21.126
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/9
     eth1:
       mac: 00:26:b9:3f:4b:4e
@@ -692,7 +692,7 @@ suno-27:
     eth0:
       mac: 00:26:b9:3f:4b:62
       ip: 138.96.21.127
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/10
     eth1:
       mac: 00:26:b9:3f:4b:63
@@ -718,7 +718,7 @@ suno-28:
     eth0:
       mac: 00:26:b9:3f:49:56
       ip: 138.96.21.128
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/11
     eth1:
       mac: 00:26:b9:3f:49:57
@@ -744,7 +744,7 @@ suno-29:
     eth0:
       mac: 00:26:b9:3f:47:ba
       ip: 138.96.21.129
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/12
     eth1:
       mac: 00:26:b9:3f:47:bb
@@ -770,7 +770,7 @@ suno-30:
     eth0:
       mac: 00:26:b9:3f:41:30
       ip: 138.96.21.130
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/13
     eth1:
       mac: 00:26:b9:3f:41:31
@@ -796,7 +796,7 @@ suno-31:
     eth0:
       mac: 00:26:b9:3f:4b:56
       ip: 138.96.21.131
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/14
     eth1:
       mac: 00:26:b9:3f:4b:57
@@ -822,7 +822,7 @@ suno-32:
     eth0:
       mac: 00:26:b9:3f:44:68
       ip: 138.96.21.132
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/15
     eth1:
       mac: 00:26:b9:3f:44:69
@@ -848,7 +848,7 @@ suno-33:
     eth0:
       mac: 00:26:b9:3f:3f:67
       ip: 138.96.21.133
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/16
     eth1:
       mac: 00:26:b9:3f:3f:68
@@ -874,7 +874,7 @@ suno-34:
     eth0:
       mac: 00:26:b9:3f:49:5f
       ip: 138.96.21.134
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/17
     eth1:
       mac: 00:26:b9:3f:49:60
@@ -900,7 +900,7 @@ suno-35:
     eth0:
       mac: 00:26:b9:3f:3f:1c
       ip: 138.96.21.135
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 6/18
     eth1:
       mac: 00:26:b9:3f:3f:1d
@@ -926,7 +926,7 @@ suno-36:
     eth0:
       mac: 00:26:b9:3f:4a:94
       ip: 138.96.21.136
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 7/1
     eth1:
       mac: 00:26:b9:3f:4a:95
@@ -952,7 +952,7 @@ suno-37:
     eth0:
       mac: 00:26:b9:3f:4b:2c
       ip: 138.96.21.137
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 7/2
     eth1:
       mac: 00:26:b9:3f:4b:2d
@@ -978,7 +978,7 @@ suno-38:
     eth0:
       mac: 00:26:b9:3f:44:b3
       ip: 138.96.21.138
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 7/3
     eth1:
       mac: 00:26:b9:3f:44:b4
@@ -1004,7 +1004,7 @@ suno-39:
     eth0:
       mac: 00:26:b9:3f:4b:2f
       ip: 138.96.21.139
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 7/4
     eth1:
       mac: 00:26:b9:3f:4b:30
@@ -1030,7 +1030,7 @@ suno-40:
     eth0:
       mac: 00:26:b9:3f:49:44
       ip: 138.96.21.140
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 7/5
     eth1:
       mac: 00:26:b9:3f:49:45
@@ -1056,7 +1056,7 @@ suno-41:
     eth0:
       mac: 00:26:b9:3f:45:3a
       ip: 138.96.21.141
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 7/6
     eth1:
       mac: 00:26:b9:3f:45:3b
@@ -1082,7 +1082,7 @@ suno-42:
     eth0:
       mac: 00:26:b9:3f:41:21
       ip: 138.96.21.142
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 7/7
     eth1:
       mac: 00:26:b9:3f:41:22
@@ -1108,7 +1108,7 @@ suno-43:
     eth0:
       mac: 00:26:b9:3f:3e:95
       ip: 138.96.21.143
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 7/8
     eth1:
       mac: 00:26:b9:3f:3e:96
@@ -1134,7 +1134,7 @@ suno-44:
     eth0:
       mac: 00:26:b9:3f:45:2e
       ip: 138.96.21.144
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 7/9
     eth1:
       mac: 00:26:b9:3f:45:2f
@@ -1160,7 +1160,7 @@ suno-45:
     eth0:
       mac: 00:26:b9:3f:47:7b
       ip: 138.96.21.145
-      switch_name: FastIron
+      switch_name: gw-sophia
       switch_port: 7/10
     eth1:
       mac: 00:26:b9:3f:47:7c
-- 
GitLab