diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json
index 60580fedde0a42423c6192f64f11233b4521a410..952a41f576199f93faa9b313f81ccd4cdb7a19d3 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-1.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-1.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/3",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json
index 835d781d3e3bd83a50a1d70bcae754773e13c37e..3d866830bf4ccc6f094fa4f449d8e33e2cf87ee0 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-10.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-10.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/6",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json
index b89dfa187ed116a801b5c9fda0777e16679c5723..48f5991fcf60bcccac347a49f70be3bf66990894 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-11.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-11.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/13",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json
index 0614e5599d99e150a5e1b87df64f72214e019610..cb08f5ba5ee1954fa5d21d8e3be3a17fb27b7dc2 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-12.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-12.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/14",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json
index 9b9ac46a76e036d1435c2ae5664799bdfc592771..f93961913e55a0435f18da52ced38668f10e5aa4 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-13.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-13.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/19",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json
index 277d8670d471202cf645a9597747ab259650d2fe..af3be12235ff593e5a590a35215ced37f4fa8e31 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-14.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-14.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/11",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json
index 9d8447938a53bfdb59ea6214f51181c4e28d8161..9264737fb7dfe32d5289ed7ae31e1e488f68e47c 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-15.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-15.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/15",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json
index b81a71c27e210a1cfe18b5f4bfac67af4e9ade0c..eb3457eefc7dd69bc5b5095c47d4aef842417a90 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-16.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-16.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/16",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json
index bf4d1c90ce05b2dc2c32a4be001decf635b3482f..fd62d9017e18f87996740a2df68559b4754ae877 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-17.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-17.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/20",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json
index 25dad4a2e711776b1ac2c2f4ca3a9920d50af0f1..7bb3dd140f308ff717af4c47b5b5e61f75bb87d8 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-18.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-18.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/12",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json
index 7d757ca0e04851224cc1102557f0ca29361fbed2..b8ebbd66751887c1ec0aec8265da0617bce54f0f 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-19.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-19.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/17",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json
index c34344e938f1071259c9c49eb5ee380c214f954c..13e93c3e43d3e8536b3abc25cf727f8ec0b9fd39 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-2.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-2.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/2",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json
index 60acd571710920c359d60db6b0aaf1ecaaf6fdc3..584d49671ab3cd49b3dc20bb7530681b522f2a8a 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-20.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-20.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/18",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json
index a852941763dc3351ff12e8b0e661461dbb0528ad..129894c604a251a6edf17893f9d17918338a6172 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-21.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-21.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/7",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json
index 94bad88a8d2c41e3423e58787a93e922253d0774..1421f384a4530eb6c8a885910537aa6086d51c3c 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-22.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-22.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/10",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json
index 57702fce82a07632da93d18762a28296e16769da..b9a06fff4a12d0cba741cc98c41a76f9cef892ba 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-23.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-23.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/3",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json
index 62d8ae0d7fa05ba3d117e6bf180c824a015367d6..d9b0d11cfbeb3306163f437503a2d0e3e14da45f 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-24.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-24.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/6",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json
index 5b037b76b1a14664688f7ecfade05bbfe328fa03..500a06da5bea640ad7a854fdfd1af5918c6a7636 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-25.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-25.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/4",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json
index e3f1b49d11b4bc686a152b548d0c62c67fe05b2e..305fc68c83753088db9fd304540dbae72d55e0fb 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-26.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-26.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/1",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json
index c0f78f25be759a558b0c194ccd47bfd176939bf7..303ae7938c6e8d5d0be5d5223eae21eacb60db62 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-27.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-27.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/9",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json
index 33136a68f621ee557949e37b529463bd50330f30..c8ce718b0ef279e54e5b8b6035f94f7dd73f3232 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-28.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-28.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/5",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json
index 66eb9f470075347abd62010c78b16f715ca49a01..60d7a3e189aa9ba1478e548e00d415bd7b7106d4 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-29.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-29.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/2",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json
index 36dcf02f3661467ee33b9fec79b193e72f6a6064..4773f615c86f3fa337c25555a3333109b810edbe 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-3.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-3.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/7",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json
index 875aad48aca99d8caa9eace37974e40274fcfc3e..3679f7513993f5937796bac6b817c6b5bc83271b 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-30.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-30.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/8",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json
index 4f5ce0f427d838278ae2779aadebd2d564a5f68b..1c2e12aec6357139952d9094a03c7886bb0401e8 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-31.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-31.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/15",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json
index c59deb258b1c224dadf6707ade559406bc7cdffb..27e8572b40912c6066c9e6e9f93e3ce863790108 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-32.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-32.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/16",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json
index 426d12bb72fdf91bfae8e3294a7c6566838ae8d8..1225d91613d05de6484571f69ca69aaaae7303c8 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-33.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-33.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/20",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json
index 5f1accb48dab32aabf9a613a4f29c7b407897341..57fc90c00a06723f9923a6effb5bffde96bc283f 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-34.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-34.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/19",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json
index a098aee5ac57139a30001bdbf54b741140c1aaad..740be8fe8b131ffeb8058b5e629db44a7c5020d6 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-35.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-35.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/17",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json
index a794b3345849f03824016d5944fd77e5796497a5..f354b707d6e42a3729ff2c0084cf086cc26016e9 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-36.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-36.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/11",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json
index 036ddbb1d18cd33f2becefb077ac6a2ec7a1706d..4a0350f1e837d8969b099df6597360a98cd5c9b1 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-37.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-37.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/18",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json
index c48b64031046d7794ab5fd36cd5fec5a76b7ba20..abb5c4d2df7ab77b12edb5a57546a5d48c24b5e1 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-38.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-38.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/13",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json
index 20667fcafafc4f10bdba172ef4b28361396e0fa3..6005f70539b2d82fda02d14cfbea61cd31bf02d5 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-39.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-39.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/12",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json
index 1dc4647f67893c7c4c73fac989aeddb3bca7a3b9..c352e937f73f96281c367d38d42e621acf7ea3fa 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-4.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-4.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/5",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json
index 4f0a83c53c97cb0692f00b0515ea2aa92e06be80..7bdc1e0ac93f670e641b1dd6b2637764e168d5ba 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-40.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-40.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/14",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json
index 6de421548f0f43218a1ea5a71e3b7c4c10d0da64..2f9d5d21e90c84a975ed66f50c4d36dc698293ec 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-41.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-41.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi8/16",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json
index 4b5579c2adea4850053016d1a594d91b82ce55ea..838fd067044400055a50542d99099eaba4d19813 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-42.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-42.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/15",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json
index c6c4edb5f05738119c23fe29351be26ab4b339bf..018a3811e8936206b8d384aecfe135c14acc0238 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-43.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-43.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/22",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json
index 674cde07d744df1b42c098bf8882b0a0458082f7..352ab37389e3014c4a9826b26482efb6673211f0 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-44.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-44.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/1",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json
index dbc06128fa696c0f385798aebebdcb7e39f36a8a..508be8362f6af63df1251edb3588dceae81a999a 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-45.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-45.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/6",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json
index feb5bd228c9bd203083361852be5c0193a28e605..9ac46fadbd73d02061ecd0a8ba27eaed3c5bd33e 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-46.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-46.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/11",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json
index 14ffb3d0c499dadb84004a1faa067fa7f9cec192..3661c67cdf37fa12d490b2129f8ef7738716139d 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-47.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-47.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/5",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json
index 3f5d491c704c3559e20c9d13c1c5795de38338e6..a4937957ecedf7238ccdb9f95ce1defe9b4173d7 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-48.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-48.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/4",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json
index dcb930c0906581613cd32ac7d08c69dde1d2c977..2db6d55db7b797b14447794446a1c6f8e0742b02 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-49.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-49.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/3",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json
index ce1fbd37a33ed407211d8c79445de49a2bd5124f..7ff23090ada1abc09a4beb6b67d3ac05fc6ff73f 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-5.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-5.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/9",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json
index 25d679b356c016ff4e9b8982478f7f6497ecf330..14f088da9c48b29ffc3d8b62401b24a58d1bb29c 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-50.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-50.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/2",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json
index dfdbd46f93f7fe7f7b7b840c42be4aefa1820302..63fb750fd22fc4ce8f4134bed32953f9d784741e 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-51.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-51.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/10",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json
index 927765743693305e2c69271d78f633cb80c9861a..6b9334b1d469b92e97c38f8d48743ca3202b927b 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-52.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-52.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/9",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json
index dc6229363e98cb4f7bf72ce01f5b393a5d0bbbfd..e42e45cdd993aa9707d5b2910abbc8241411e1c2 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-53.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-53.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/7",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json
index 4db1cc812080bfc65c5051626e2218f1a1e5a8a0..c8d639570aa2a1438182c83b7f3a9d244f7ff91b 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-54.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-54.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/18",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json
index db81dc109be264176cce6beb08cba827a1e20b95..a50eb7e6b1d8e9f7749f0f0a4a6c2863e037a933 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-55.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-55.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/19",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json
index cfa0f7709825fea9428626d7b37c8852b8d9bf5d..50041d068f17c58745e8c208af49b6a089cac61e 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-56.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-56.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/17",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json
index 934202a13454e01b882fff5da659bf22f76c978b..4b9b7ac534cf58ba7eec4551614f50cb3cd7bf5b 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-57.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-57.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/14",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json
index c51590b35185ee0852e2c2cca25671441a6521f4..3cf6e4fcee1c0f85170a8b38dbce7dc126800c67 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-58.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-58.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/15",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json
index dbd434978937be0e6dec437852752bade1d06933..2165939c656faa31a84986de92eeced2f848f2ad 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-59.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-59.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/13",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json
index e947c29d8f25ac9a18ff53ea1f0f8bead7cbddf6..08ecf928ec803ebc1deee93d29e26a54edd31d15 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-6.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-6.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/1",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json
index c661a6e490772c99cc6fe3f49c16084d4ccf0950..1e2f9a4eb9aa93165031fae03af137e3d0f31583 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-60.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-60.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/20",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json
index 5932174b92983e3493bf8b5b6ab90de0c250e076..3d8dfd8d6ad24a1af88b6696cea8e5fbf84735bc 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-61.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-61.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/11",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json
index cf415ce442161b2a2fa711db5e6db18f108d6a5e..6c28c913ac44297022b73b658ae0d77dfbb46854 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-62.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-62.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/16",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json
index 3b7546426e33e93e465834d628567fc3f1e32366..a5473bb83401602f233b6586e5d813bc78a38917 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-63.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-63.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/21",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json
index 610770ef0720245705e24e2a56c2d96820bd31ab..3b76a8160d2240b17f31322a872632fa2bd5c014 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-64.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-64.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/22",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json
index 99b62338483d119c0a09d0cb83d5d837440c676c..5a6d4ad927c971e9ac752bb564fdf092ede830f6 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-7.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-7.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/10",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json
index f0e2c35c76f5ff9e9512dae7f5b1caf392c910ce..4648acf0f223f7690383a081ea1430375337c21f 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-8.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-8.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/8",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json
index 130765fdcaec95830d05b9cbd4be7c89b75e8d69..0d830302d0aa566317c55746aae7c2b2085f74f0 100644
--- a/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json
+++ b/data/grid5000/sites/rennes/clusters/paradent/nodes/paradent-9.json
@@ -38,7 +38,7 @@
       "mounted": true,
       "network_address": "paradent-9.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/4",
       "vendor": "Intel",
       "version": "80003ES2LAN"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-1.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-1.json
index 85ca2e46bb2b15e9c6e170f1f938fee13daa5e11..9872c4ad503ea8ed0a26c946ac9aef3b253c9a9a 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-1.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-1.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-1.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/26",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-10.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-10.json
index 5eb2498150d48352d4bbc284a8668e9e8c929dc2..628b0115196c5e7ed279b4d008ffa73751eb88c4 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-10.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-10.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-10.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/10",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-11.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-11.json
index b0c9e57b36711f82c375303978b9eca4cbc15a96..8a18e2d7cdc7261ff24362d9fd851290c3c5d24f 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-11.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-11.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-11.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/4",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-12.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-12.json
index 66ca3e3fcbf2f890e589848e65c7a6e5ccbf5063..eb08cea90d7006887973d8f1d8fd33585354737a 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-12.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-12.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-12.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/12",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-13.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-13.json
index 835526c5f5c849e8503a406e11ff75e27a78729d..c2e3b4097a123bce14f8781c6b89baba9cc8178f 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-13.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-13.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-13.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/13",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-14.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-14.json
index dfc97d772f5b8384339143dbcb648e1ed49ebb6f..0b6147eb07671ea015a34dea2ced1ee8cc3315c0 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-14.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-14.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-14.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": null,
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-15.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-15.json
index 81f5d1664d588a94ae4288df44332ebbb52578d1..1346901159b72a22e9476f7df78498765461e20f 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-15.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-15.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-15.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/8",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-16.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-16.json
index c5bab720efb49fce37af5040abf43e97143edf24..8c8e1eb5c289a90463f001391a95266712cf112e 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-16.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-16.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-16.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/6",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-17.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-17.json
index ecd9f7a8376475a3fc83fd64f6825a58356eea93..baa96578f8d10f0a0c4a5b0f0ba37f20ccf415f0 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-17.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-17.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-17.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/4",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-18.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-18.json
index 69434a0ce4b270f3044ab53597cedfa289858668..b0861c1280ec0707b7afeefbdb32759b70ae1db5 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-18.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-18.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-18.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/1",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-19.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-19.json
index 7b08789c0ab209a67cc92c223f28b311a52fc298..4a7466f7da45d1047d594368bb409ccc40036277 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-19.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-19.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-19.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/3",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-2.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-2.json
index 16ddd1de221e672b08e734d9d14559c43c49fc50..cc8c31d5ef56534a3835146369ed3ff659c7d953 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-2.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-2.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-2.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/23",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-20.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-20.json
index 9cb2123d511c9c431759bc3f9e6b599349b6ad86..deef03dddd8f1a386ebd802ff292540b7bd0b944 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-20.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-20.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-20.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/22",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-21.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-21.json
index 326e0fe9b7f3a9990fd62c49c82bb52476382a2c..0c03b8db23f94349ec91d6020cfe83cf4e6742e4 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-21.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-21.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-21.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": null,
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-22.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-22.json
index 4642c232543d97e53e8439780938c96a3ddbd69a..026e99816c843d35225a31d99f7a74145b275a20 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-22.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-22.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-22.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/3",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-23.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-23.json
index c210720ab14a2259e211b265332457b0bc8f7a3a..a362adb409b1ed705bf02c8829f740f383f23315 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-23.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-23.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-23.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/2",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-24.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-24.json
index b28c7356cbc3a5604655bf725c1e1cd8c235496d..90707626c50f40cbff61c9cbd30cf74e508893e5 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-24.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-24.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-24.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/7",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-25.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-25.json
index 6649d3d44ba9418800ebb4e5e199ff9c566aa45c..3cbd2d06e943ff5e261d55f10432bd54a3388b18 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-25.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-25.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-25.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/9",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-26.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-26.json
index 797b4e28edeb2a494a01456c2e7ed0f61c196cf8..32b0ab52f8e5deb5c7ac9148df56dfd65d785dc8 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-26.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-26.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-26.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/5",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-27.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-27.json
index 046c0d7224899c6cc0b05e71ef84224d7de72249..60e07a85b4e630e410695b01e2bab513aefbc727 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-27.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-27.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-27.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/2",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-28.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-28.json
index 0c58d6a0e7bbe4eed52f9179f3bf56473ca2a872..feccc538a9a0485a7140ff8fcaf111d0797a871a 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-28.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-28.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-28.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi8/45",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-29.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-29.json
index 524137f5f0d83eabc87e583601432e7ece66b40a..36fa590a67ec6e5b37568bf6f1f75a1ceee61fa8 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-29.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-29.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-29.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/8",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-3.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-3.json
index b11c65cf346974722214d30342dde021890aa386..7ead5b6458d649a1975f14c5db5efc22459059d7 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-3.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-3.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-3.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/27",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-30.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-30.json
index 234098177d6ecb67f5c87b5748fc99a6d2c0ff62..024207f487ac9103ec3c6a63ba030f0fe66240d1 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-30.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-30.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-30.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/1",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-31.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-31.json
index abcab6afd17fd2a29e1769d793e085b7670007f0..c16b3aec8ea07349ded2e72d88dda21a3a3d949e 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-31.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-31.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-31.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": null,
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-32.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-32.json
index a6ab6da044e6bacc8b96066799b47226e9c1d1e1..4c77a2fb50282077e889eeda5150c8695578f03e 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-32.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-32.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-32.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/1",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-33.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-33.json
index 55dcd038438f89b6252f997f9908d218c0292cfc..2229a15ff6446eba273b6b5bc23644e5f8d4757a 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-33.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-33.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-33.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/14",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-4.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-4.json
index fd02d674ed7d4ea7012fdebc715220159e3df53d..24841e23fad2f4849ab93d4658162958e6b4e99f 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-4.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-4.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-4.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/24",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-5.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-5.json
index b238958eaf9fb52449782fb31bcddcbd9c4c9a26..62f790dd5b49376c6a518a7c627dfc040b795688 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-5.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-5.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-5.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/25",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-6.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-6.json
index 19c9345e28f4e7b0b224fa0219f793cd0bc83002..31e0e1aec1ba5591afab94be410165563dffafa8 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-6.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-6.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-6.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/28",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-7.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-7.json
index 301eebdd1554d623e6642ed65a33ccb1f8c7ac30..e375536075cfd26d56a6c921c0c64bca58270901 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-7.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-7.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-7.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/19",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-8.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-8.json
index 9c21991537ddbbaebdfa4ad150b590df9adb8e75..b9ed2bb31f527ba58ddd2eb1a797644ca4be700a 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-8.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-8.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-8.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/21",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-9.json b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-9.json
index ae81d37e40d8815f5881a0bd2620354606e7bc66..89df27cc65a7c4312c5020829a3ee9a201630499 100755
--- a/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-9.json
+++ b/data/grid5000/sites/rennes/clusters/paramount/nodes/paramount-9.json
@@ -41,7 +41,7 @@
       "mounted": true,
       "network_address": "paramount-9.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/5",
       "vendor": "Broadcom",
       "version": "NetXtreme II BCM5708"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
index 6887097c3c7c3fea41cef893a493487f53b72e48..83fc9c97a6313a28832f1f08e8296c05e5342f0b 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-1.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/47",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
index 05e6733f4f64ccfe96ce1ed58e120aead459b84f..87d32ccda736b10996d05b1c3a05f2747bc8d275 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-10.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/43",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
index 9ba119b5bd3c624b4fb331654a6c28d164cdfaa0..51fc5ee07224db0f420bc9fa9c5aa0c47586d1f1 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-11.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-11.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/45",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
index 0814b6790ae2456deae2c39ac1fcd490f493b18b..06b2a02ec5cb541622eda7482579009ef3be75e1 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-12.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-12.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/48",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
index 7ad64cb4c51625d5d716a1e11f8a592d05cc85a5..6eb2306590259e4821bc1cd716fccc2a2b305ea5 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-13.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-13.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/47",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json
index d0dde58e62eea9368e3ea81d53e2073276cad87c..417a366b6b936667b4b86bdb79d572dbbcb94fd8 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-14.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-14.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/44",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
index e7da86ecdb3f9d478b6bc55266f826efd86a8239..d0b0e2a4c060d8cc6fa2f8fca3655c6303fdb6d9 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-15.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-15.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/46",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
index f39e1102d9ac13027f7b6ca7aea590da51fe5ed8..e610d38578daeedc1c537d37eb01a7c99f4c9534 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-16.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-16.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/42",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json
index 389b8d7686ed793adbf4f6ef14d35dbadd93502e..ed8a3af786b21c4b27983037797e94497ec3397a 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-17.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-17.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/41",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
index 43c505e5d8baec684761cfee793d913895a43fd3..379628e0f6c067aa5983cafb84776e1c09ae8cb0 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-18.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-18.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/39",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
index 802bd38a76a563dea63678c52e5f163f95ac8d5d..0d95d09a5b099b8d8762cfff8bf9612177f76965 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-19.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-19.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/40",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
index 8f18202c5594ea94d9cc9c40c03d2a7294db8952..3040f6ed398294b4dbe51a30fc064d2150cd60ad 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-2.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-2.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/48",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
index baada918277a38f2a914a93b4aa1a341dcce8e0c..87d50c6176289566b6986a8a61ec90eea49ba22f 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-20.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-20.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/43",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
index 405ec45f98d84dba2f39243251ea0ea55bf59792..1880502a0571751ace2ae71af020d697b6b5ff4b 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-21.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-21.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/36",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json
index b3e7db4cb96a659fd2368f2c571347133929b7f5..953668289a1846d83f9fcb2efa2e1a59c006ad89 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-22.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-22.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/38",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json
index f328aaaa67380056f18b9c193311dd35971a95c2..e3404a9c9eb2b30230f9bcc91dcd9aa797b9653e 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-23.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-23.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/37",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
index 10909ec8f9f465d923b008a0f8078ce0d34f5dec..3bd94257503ea409845913ddf11dd0318f40cc24 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-24.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-24.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/37",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
index 2eb6a2241dcf16ea4928c2c52cf1ceaee5f6aee1..95a9725c7079031b23e93cbbc0b83fb8d0823eef 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-25.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-25.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/38",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
index 780e3311b83d037210d7d962478945bb948d63ef..6ed22f36c9a1833fe330321ba00615316adf07bb 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-3.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-3.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/34",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
index 64749d0fd1abd201dc566de651de4e08443dee21..0d344b5a5ddc93c27360685037fb7ce4469fba89 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-4.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-4.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/46",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
index edab185260ffdf4559896aa234f7853d7c4d9046..6f2a6673dfb133d874bb8757fd5f4dbce17bfd28 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-5.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-5.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/44",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
index 3f3f07a1dd441f9454652de4a6dde0402dbc6b47..524dfde1db3df3ca9053f4db622c83ed136ae53b 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-6.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-6.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/39",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
index 4a0caea9b379928812cba8574ea18cbe2fead5b0..21ce2e72ca9f810f9f7f12eb6661997134448a3a 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-7.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-7.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/40",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
index 4770ff8a5b8e52e4d51a53c559f51deea11cc967..947bff8ccef373b2839bf985277eb4d053e69e71 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-8.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-8.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/42",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
index f5a6faf572d6c96287973ccf7a4733794bb32085..bb631515e6090cdd2c30def2d2ba4ab937645681 100644
--- a/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapide/nodes/parapide-9.json
@@ -40,7 +40,7 @@
       "mounted": true,
       "network_address": "parapide-9.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi7/41",
       "vendor": "Intel",
       "version": "82575EB"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
index 3251a0ab75b7bb63e0ca3f7dae2e3687ead9290b..2d6832decb796d32001526a918d946f9aa1ad62e 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-1.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-1.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/42",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
index 0987af49d5e921e1d53f898b2521f6b23d939c52..74cc525f0aba202c1edd6863ae91f27b3d83441d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-10.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-10.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/31",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
index 890f99793db423a28598f7cf78cd5e93d71fc02a..fa2bddaf452c3c9fadf2a4ad0c82f2154b286205 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-11.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-11.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/40",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
index b0a4eb4dd3dddc094ad8427339679ee346fb83d0..d5c4ac5ddf1e64e4af6c1dda43229f154d388e19 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-12.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-12.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/41",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
index 18f2796a19125fe78ae05b9b6a0258e85e19eea8..0b60e88dd869dec65662c2038f908928c9fdb541 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-13.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-13.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/37",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
index 18890457896b12ae03c0a2771d38d582ea7a5e56..9954ece0e05452f5275f3eb8ae6e3753756ff5df 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-14.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-14.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/38",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
index 0036b410a3df59fa7356bece29cd6913268fd29b..393c0cd878e37c7e5a93b411a7604b6734261e8c 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-15.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-15.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/39",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
index 7d6f4aff8d2cf42a17f2bb9ac3ee5d10b38f9a23..8d5cb7e23f2f602bda911746ac25978445295656 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-16.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-16.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/44",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
index ffe513b2028740063c7bce966d87013950f5299f..fc6e1c9840a5cfa46da4b2efe87f71087685f63f 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-17.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-17.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/46",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
index 5a074b967d0e6f1d4a7a85973e505617371cff5b..b058504f4af611785a725e90696b878202366a27 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-18.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-18.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/45",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
index 6ad0a070af314caed8a7b26575f3ae609a45285b..3551b62ccc7529699bba1f280a9db8dbf5a6176d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-19.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-19.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/42",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
index f56a7795902dddd4dc1b52b7f3c1712d7c947986..55cee6ace69d06c7423c4eac17567e048387a3d7 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-2.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-2.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/32",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
index e3d985d4a39e38d7d86b1bcebe3feab0d16348b3..c59c3665ad2707a55eadc40fd56bf59be1bde53a 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-20.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-20.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/43",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
index 7c7ec35acfa3a4768cd62ee71124b72ff64493b1..a9e8dc4e72252b8d86c8ebeb0249c62c7cd5a619 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-21.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-21.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/47",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
index 444a2ce4ee25a914a3c9de97c7daf0c3956ceebc..eb5287b08fb3e763af7620464499aad532d1fb82 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-22.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-22.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/48",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
index c2d1fbbcc7c22172919d661da29d59e996407f4d..afdde374c0d52b8f13f1a892f6b158dfa054352d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-23.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-23.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/46",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
index 8804c6a003b5a820aa402269df3d7b274b9acd17..03514760f291f88f27959a92e467061bd3b41384 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-24.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-24.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/48",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
index 837c72d0ce297a03fe7c495afae961b914f96fa6..f5f57a8ef4c937c1684e982c1dfd66cd1e775aea 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-25.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-25.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/47",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
index 582815aa630ffe0627c94f9b0f996c47792f01a7..8cf3748d259c99eee864039b2f266b8d41146b75 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-26.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-26.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/46",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
index ce76c17dbd677e5a0b028662d0b5db5e9f300888..bb9a86fbdc0fea03689cc0fe5713c64e77c9d41b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-27.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-27.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/32",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
index 748ee860950f1857393db25674efca53f173d5d0..3572a6fbd53ab02f1536731024e592a59a51cf82 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-28.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-28.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/31",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
index ab316eeb99947e5f0f674324c6070db34161345e..dd41c3469df2bc433b14d19848201301df7faa29 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-29.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-29.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/48",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
index cd13cbbdff9e971fefda04bfe709d0758cb4337e..5b00a4067033c5ff5297d2f977583edc9b044411 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-3.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-3.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/34",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
index e87b1f893207ed34a944f545925e3b9ddf2ca35c..9e65979d14497efef9b5720c09cbb6f84bf4e9b4 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-30.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-30.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/42",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
index b2d6cccc4d2295c6d0367605cb5866d25c021f25..ce017c239ba08d82766abeb67945f3eba0616ad9 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-31.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-31.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/41",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
index c5813bd62f2d5e2b0ca87eacf9b63461cc34dc5f..c9b3b8b3309c7360e9de45a70967377e0cc345c8 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-32.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-32.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/40",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
index d2c809416b37242a8dff916fa9c763a0853035c4..e1d56d51771dd7db1700e34f364d82053e943459 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-33.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-33.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi6/33",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
index d61299e6f61ac6a40fa879ed8fcb3496dbab5fde..82740046c99afcdae4c43c7419f1a2d2ef9d347a 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-34.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-34.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/39",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
index a2a8eccde1dc270904e6a8dbccd4ecf537b55a04..27478929ee74447e07492c39b1cd24c702cfbd3b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-35.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-35.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/33",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
index 16ba11072d990b31a25d6a00e37108cd9faee2e5..6e9621bba3cc66cd80cf78c6b5059566dc70507d 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-36.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-36.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/35",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
index fd94654327cab110ae7450b53929ecfc8d5ba09e..8677e36cbb9d8e90a3e1bfe0fbda8799bb757032 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-37.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-37.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/38",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
index e34704c945b60af25e551f2bd8a908c66389fcb5..3f167bd8778d56ecabc59e3e0f53315fb3a478e4 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-38.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-38.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/34",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
index 7965b7fd15f0dcca111d6cc9255a2a60bd649b78..196b2d59bd387a246128fcc2fe53508968b3472b 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-39.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-39.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/36",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
index df0e31be3b80b40f9da46fdebecdc2f8c69020dc..26f711432b9d8742e89335137a0a7dd73599a006 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-4.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-4.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/45",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
index 91823b8996076a0a0efaa1160009d003bd1e99da..affcfccb5111625c0f2fcfa1cd3be71619ca0998 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-40.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-40.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi4/37",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
index 3ffc26893bc1755e6a812c8c2a7bcc854601fd20..8ced60489826550507620a99c5566153d1edf292 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-5.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-5.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/29",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
index c3570e78c9421b177aa9c4c6c1c7dcf26eb7f29e..c66a4c68c2ecbc4f0af7ace2d3b966622b480fce 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-6.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-6.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/36",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
index 9a0d26f102a90ec26c39f9c3a6de6f04530a8338..3b4302611650cce9f915d88c30bc9136fba9c33f 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-7.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-7.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi3/44",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
index 701cf737cb9c9ded7a7a246399c45752589d90dc..3eabc8c98b23abf79b36431ddd30ecc6ae8c9205 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-8.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-8.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/33",
       "vendor": "Intel",
       "version": "82576"
diff --git a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
index db580ed8f11017697d494c32679bdad7c5e085d8..e5600d4031461381ccd7e094397fd2626cc16980 100644
--- a/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
+++ b/data/grid5000/sites/rennes/clusters/parapluie/nodes/parapluie-9.json
@@ -48,7 +48,7 @@
       "mounted": true,
       "network_address": "parapluie-9.rennes.grid5000.fr",
       "rate": 1000000000,
-      "switch": "c6509-grid",
+      "switch": "gw",
       "switch_port": "Gi2/35",
       "vendor": "Intel",
       "version": "82576"