diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json
index 9ca71da41416915997fdd7b9f94e8f8b5980d55b..2aef53fc452e4921742143b6d0f3f0ba3c7230df 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-1.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-1.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/1"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json
index 37e2ad33637cd701c47a6bb02a51f09c6b26f55f..f49fb7d70c18bb3461c1da996b42fec8362f2a06 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-10.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-10.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/10"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json
index aa131a84c9eb80a925ec0fe890fda5bbc4b53cda..e2abcf693efd0bcf165df354798e686f8cf19400 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-11.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-11.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/11"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json
index 6f25cc54ad2ad9d75339e46504048675de7b77ce..ab28be275f23af80b0ccda89481c661467a520bc 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-12.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-12.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/12"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json
index cf0dbc0bf696f0e7ac3cbba38276703710a503f2..faaa872a3a3ab0255f31d42f7b494f30f0010834 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-13.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-13.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/13"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json
index 9df71977589a6fcaa1d7c6307489b7cadd644952..e75ccdcbd341ac99f4e8ea39f39906c4092091d2 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-14.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-14.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/14"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json
index fb532667a66a9a3caeaa29aea5b04fc6e3874895..a8633b93ef8db34b2444fbc0eefcc9720c123653 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-15.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-15.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/15"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json
index fbd4067bc30962ea25a3afce7ca74b12738bb30f..1a1fedb56dee948d9e899aea3e3119b99aa99db4 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-16.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-16.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/16"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json
index e367894627ec253e5c26878eb8ad2942115c6c4c..962a9b1c4ce6cb94f6e0d588ef6ede621777b141 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-17.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-17.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/17"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json
index 22b64099d5e370ce546864af6b5c0465df37ca01..16e2af001afddb284c290269e1d09e83f5aac187 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-18.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-18.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/18"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json
index 83c22bd15cf825ee086380757f9c4e4420e61101..335e5deb9f68e5858aadb8c589e6c7b76db96a63 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-19.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-19.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/19"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json
index e7e2dbba1f83378c700d205a74d2f24cc374016e..3ee95be27eaba8b68492ce3fe5a2aaa19c205677 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-2.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-2.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/2"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json
index c197faa8cdacf394b03df3a111b44845417be66a..481e9c0489997da77cd3fa617e565e3b2398f5b8 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-20.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-20.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/20"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json
index 0c9bfe1ebd9bad3b1df7a084b8e9c1877e2c6a2f..494e6e374572684fcfb2d0b20608b62af90cdd7f 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-21.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-21.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/21"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json
index 1c8923b51149d6904dbd8b57dc5360be307d29b2..0f47a99f2a95fb1bf44fa92ca8db15cdf81276d3 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-22.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-22.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/22"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json
index cd19ec0a5a663b06068c272dbc67706f76093fec..646c96a0ad102ad4be56cf8930b8ee6c15463c47 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-23.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-23.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/23"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json
index 4c47f6aa4b50961f570869d6da5a5844cacee799..deba3186c6a3242ed646de8525322a6e995f2700 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-24.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-24.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/24"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json
index a776f9681dfe33247cfa3056be726effad8697b0..9bd0f1056fac2545ee0ddc48c89637b57fd41e25 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-25.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-25.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/25"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json
index 4b91bd685b689c9604f2836dc99a7b43b3daade2..3eeef58c6f1174fc112564ef9f370c311194dadd 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-26.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-26.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/26"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json
index 54e62319174e6194e31a841e1159230d44636c04..b5c298000a983ebd4820a54c6bdb3a80bb3248cd 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-27.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-27.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/27"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json
index 3a652ed326fc093e805be0f004bbc54a3d40bab7..05d267768bd477575366f7e076dccd760c99b2f4 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-28.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-28.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/28"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json
index 6bfb22838a1a3716cd2d56ba98a88d34d6829eda..0785702900ea4af754a5abd365242a3bf5061094 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-29.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-29.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/29"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json
index a5394ff4330780d0c79fdfe1f946571fe81ad25d..d377610254573aa4b820ce4cc01dce0aa0f290ba 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-3.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-3.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/3"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json
index 42717582e33bfd0bfbbd252ee024e00775f046a5..78ee03d90d685561abfd39ed2392e4d48bc10704 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-30.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-30.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/30"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json
index 70d54794d1955a8eabeb983caaf86fb5701fd127..644c4eb41e8bb465f98ebfa05a8e28b763a6909a 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-31.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-31.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/31"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json
index 88d937a3e521727608d902bf5555be407796311d..ac216c2b04f6f1556bc083db11aa439918a979d3 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-32.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-32.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/32"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json
index 73fca8285f4ec1f148d654539435084b34e459be..4f3a07471e85843f893103a6bff4034d53f8ced6 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-33.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-33.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/34"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json
index d200f7851750f79ee211db000e547efbeb2e3d4a..e1f6850149525f4fd8a4944fecac9c2e32307112 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-34.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-34.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/33"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json
index be37ccff816fbb712a05826980a3f4d3e8b0d436..62ca0cc6ccbf6f85e4e0afba393d516413f04025 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-35.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-35.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/35"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json
index 35c89e39682abe22a116fd87c99f37d19c13021d..7124e7ee4329985ca8da814955ef3ce90da90d14 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-36.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-36.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/36"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json
index 4fd4970d37be16ecce695bd248badbfe5fe10802..681ee76be1f4cadc1014fa398315a771eae54ff2 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-37.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-37.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/37"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json
index c27e1f0f5ea8fdc91edaf5d764bf5727d8453efd..6819ffae0db18b8d436124cb69e13361538311d5 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-38.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-38.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/38"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json
index 4c72bf79be6a31fd74e3991df9091ac5ac91f140..de1b4b0d7b3e3930e4f52110c3fff61679c04bdc 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-39.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-39.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/39"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json
index ae5869167c456d3d1bdc50a4af057e03f70cceaf..e9d952e055a36e509e5316901711a89850e13602 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-4.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-4.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/4"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json
index 5c344d01fcbee8b9bf85dc8350bcedc5973341d5..e0c7c9d226d8ba6859b46e38efe4a5ead7e8f9e6 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-40.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-40.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/40"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json
index 5bb07b07b9b8fd0729226250eedf481fec0378ac..4fc22175cdf338ff1119118fe80193cfc8800466 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-41.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-41.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/41"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json
index 0485bc2f1caf5cf36e0935b38751720386f7ad48..da75481c2476c6ecacf9841edfc5a94f37f16088 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-42.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-42.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/42"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json
index 96f3923536df203c9de54846ff28aec589bd693a..1400470b64afff47fb6976b049a22b901aeb46b5 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-43.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-43.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/43"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json
index bf532c7d2eae40fcb831b5a9018f94f7a2336bf2..0c6be4890e022cd3ae8ff72a02d128e62b322514 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-44.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-44.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/44"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json
index 052c4cf2993618139d6e0ecee518d594f5f1d0b8..9b280d2ec678e90a0bd705142d3e53656dd683b1 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-5.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-5.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/5"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json
index 8f2185d5be692672d2f8bc657d2d8aa63aef1c32..347231aaa3c1377d2eb60ae58a7c7e8ff6b39217 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-6.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-6.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/6"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json
index ae7d39c7665657dfc1d2782e21b73137e691501d..04095abb09a1264b289bd92ede11636dc4c167b9 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-7.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-7.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/7"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json
index 91ef1c09c1dae2618009c085659fc2483faa55c8..c6c180f2c09337325116b37cb0180745fc2a5c06 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-8.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-8.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/8"
     },
     {
diff --git a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json
index 70aa3b8f986030aa95ad0323bf0813839b4ef088..93a424f9b2bb47bc083aaddf60129022391199d7 100644
--- a/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json
+++ b/data/grid5000/sites/reims/clusters/stremi/nodes/stremi-9.json
@@ -39,7 +39,7 @@
       "mounted": true,
       "network_address": "stremi-9.reims.grid5000.fr",
       "rate": 1000000000,
-      "switch": "gw",
+      "switch": "gw-reims",
       "switch_port": "Gi0/9"
     },
     {
diff --git a/generators/input/sites/reims/clusters/stremi.rb b/generators/input/sites/reims/clusters/stremi.rb
index 7da10cd0ca82d82e6b81db0f6a01e206c0e2602a..3a38be176b1b3d5c9541f1cbc6bb72fdf58b69e7 100644
--- a/generators/input/sites/reims/clusters/stremi.rb
+++ b/generators/input/sites/reims/clusters/stremi.rb
@@ -64,7 +64,7 @@ site :reims do |site_uid|
            :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
            :ip               => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'ip'),
            :mac              => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'mac'),
-           :switch           => "gw",
+           :switch           => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'switch_name'),
            :switch_port      => lookup('stremi', node_uid, 'network_interfaces', 'eth0', 'switch_port')
          },
          {
diff --git a/generators/input/sites/reims/clusters/stremi.yaml b/generators/input/sites/reims/clusters/stremi.yaml
index 438ffc5ef83a95255f283d1509ea85d72bff76f2..4b4012befb45a1ba81cb0e1418e184c975ecaa5a 100644
--- a/generators/input/sites/reims/clusters/stremi.yaml
+++ b/generators/input/sites/reims/clusters/stremi.yaml
@@ -4,7 +4,7 @@ stremi-1:
       mac: 1c:c1:de:7b:16:d1
       ip: 172.17.160.1
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/1
       mac: d4:85:64:45:b5:96
       ip: 172.16.160.1
@@ -23,7 +23,7 @@ stremi-2:
       mac: 1c:c1:de:7b:36:8b
       ip: 172.17.160.2
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/2
       mac: d4:85:64:45:07:94
       ip: 172.16.160.2
@@ -42,7 +42,7 @@ stremi-3:
       mac: 1c:c1:de:7b:46:2d
       ip: 172.17.160.3
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/3
       mac: d4:85:64:44:77:4a
       ip: 172.16.160.3
@@ -61,7 +61,7 @@ stremi-4:
       mac: 1c:c1:de:7b:26:1a
       ip: 172.17.160.4
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/4
       mac: d4:85:64:45:c5:d4
       ip: 172.16.160.4
@@ -80,7 +80,7 @@ stremi-5:
       mac: 1c:c1:de:7b:26:40
       ip: 172.17.160.5
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/5
       mac: d4:85:64:45:d5:12
       ip: 172.16.160.5
@@ -99,7 +99,7 @@ stremi-6:
       mac: 1c:c1:de:7b:36:ca
       ip: 172.17.160.6
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/6
       mac: d4:85:64:45:f5:26
       ip: 172.16.160.6
@@ -118,7 +118,7 @@ stremi-7:
       mac: 1c:c1:de:7b:26:e5
       ip: 172.17.160.7
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/7
       mac: d4:85:64:45:95:4c
       ip: 172.16.160.7
@@ -137,7 +137,7 @@ stremi-8:
       mac: 1c:c1:de:7b:26:64
       ip: 172.17.160.8
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/8
       mac: d4:85:64:45:65:de
       ip: 172.16.160.8
@@ -156,7 +156,7 @@ stremi-9:
       mac: 1c:c1:de:7b:26:b3
       ip: 172.17.160.9
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/9
       mac: d4:85:64:45:85:32
       ip: 172.16.160.9
@@ -175,7 +175,7 @@ stremi-10:
       mac: 1c:c1:de:7b:36:f1
       ip: 172.17.160.10
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/10
       mac: d4:85:64:45:d5:ca
       ip: 172.16.160.10
@@ -194,7 +194,7 @@ stremi-11:
       mac: 1c:c1:de:7a:67:f0
       ip: 172.17.160.11
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/11
       mac: 44:1e:a1:53:8d:42
       ip: 172.16.160.11
@@ -213,7 +213,7 @@ stremi-12:
       mac: 1c:c1:de:7b:26:c9
       ip: stremi-pdu
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/12
       mac: d4:85:64:45:85:30
       ip: 172.16.160.12
@@ -232,7 +232,7 @@ stremi-13:
       mac: 1c:c1:de:7b:36:f6
       ip: 172.17.160.13
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/13
       mac: d4:85:64:45:e5:1c
       ip: 172.16.160.13
@@ -251,7 +251,7 @@ stremi-14:
       mac: e8:39:35:af:48:14
       ip: 172.17.160.14
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/14
       mac: 44:1e:a1:53:8d:70
       ip: 172.16.160.14
@@ -270,7 +270,7 @@ stremi-15:
       mac: 1c:c1:de:7b:26:67
       ip: 172.17.160.15
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/15
       mac: d4:85:64:45:65:08
       ip: 172.16.160.15
@@ -289,7 +289,7 @@ stremi-16:
       mac: 1c:c1:de:7b:16:fa
       ip: 172.17.160.16
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/16
       mac: d4:85:64:45:75:b2
       ip: 172.16.160.16
@@ -308,7 +308,7 @@ stremi-17:
       mac: 1c:c1:de:7a:f1:f0
       ip: 172.17.160.17
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/17
       mac: 1c:c1:de:6e:14:10
       ip: 172.16.160.17
@@ -327,7 +327,7 @@ stremi-18:
       mac: 1c:c1:de:7b:36:7d
       ip: 172.17.160.18
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/18
       mac: d4:85:64:44:b7:9c
       ip: 172.16.160.18
@@ -346,7 +346,7 @@ stremi-19:
       mac: 1c:c1:de:7b:36:33
       ip: 172.17.160.19
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/19
       mac: d4:85:64:45:b5:6e
       ip: 172.16.160.19
@@ -365,7 +365,7 @@ stremi-20:
       mac: 1c:c1:de:7a:87:41
       ip: 172.17.160.20
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/20
       mac: 1c:c1:de:eb:38:a2
       ip: 172.16.160.20
@@ -384,7 +384,7 @@ stremi-21:
       mac: 1c:c1:de:7b:46:05
       ip: 172.17.160.21
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/21
       mac: d4:85:64:45:d5:fe
       ip: 172.16.160.21
@@ -403,7 +403,7 @@ stremi-22:
       mac: 1c:c1:de:7b:36:3e
       ip: 172.17.160.22
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/22
       mac: d4:85:64:45:f5:74
       ip: 172.16.160.22
@@ -422,7 +422,7 @@ stremi-23:
       mac: 1c:c1:de:7b:36:45
       ip: 172.17.160.23
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/23
       mac: d4:85:64:45:07:20
       ip: 172.16.160.23
@@ -441,7 +441,7 @@ stremi-24:
       mac: 1c:c1:de:7b:26:d7
       ip: 172.17.160.24
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/24
       mac: d4:85:64:45:f6:9e
       ip: 172.16.160.24
@@ -460,7 +460,7 @@ stremi-25:
       mac: 1c:c1:de:7b:16:e8
       ip: 172.17.160.25
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/25
       mac: d4:85:64:45:b5:aa
       ip: 172.16.160.25
@@ -479,7 +479,7 @@ stremi-26:
       mac: 1c:c1:de:7b:36:17
       ip: 172.17.160.26
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/26
       mac: d4:85:64:45:a5:44
       ip: 172.16.160.26
@@ -498,7 +498,7 @@ stremi-27:
       mac:
       ip: 172.17.160.27
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/27
       mac: 1c:c1:de:e8:2b:0c
       ip: 172.16.160.27
@@ -517,7 +517,7 @@ stremi-28:
       mac: 1c:c1:de:7b:26:12
       ip: 172.17.160.28
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/28
       mac: d4:85:64:45:55:f0
       ip: 172.16.160.28
@@ -536,7 +536,7 @@ stremi-29:
       mac: 78:e7:d1:f7:09:93
       ip: 172.17.160.29
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/29
       mac: 78:e7:d1:fa:f2:f2
       ip: 172.16.160.29
@@ -555,7 +555,7 @@ stremi-30:
       mac: 1c:c1:de:7b:16:fd
       ip: 172.17.160.30
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/30
       mac: d4:85:64:45:c5:b6
       ip: 172.16.160.30
@@ -574,7 +574,7 @@ stremi-31:
       mac: 1c:c1:de:7b:36:be
       ip: 172.17.160.31
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/31
       mac: d4:85:64:45:e5:ce
       ip: 172.16.160.31
@@ -593,7 +593,7 @@ stremi-32:
       mac: 1c:c1:de:7b:26:1d
       ip: 172.17.160.32
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/32
       mac: d4:85:64:45:c5:d0
       ip: 172.16.160.32
@@ -612,7 +612,7 @@ stremi-33:
       mac: 1c:c1:de:7a:12:03
       ip: 172.17.160.33
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/34
       mac: 1c:c1:de:e8:fa:84
       ip: 172.16.160.33
@@ -631,7 +631,7 @@ stremi-34:
       mac: 1c:c1:de:7b:26:88
       ip: 172.17.160.34
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/33
       mac: d4:85:64:45:65:fa
       ip: 172.16.160.34
@@ -650,7 +650,7 @@ stremi-35:
       mac: 1c:c1:de:7b:16:db
       ip: 172.17.160.35
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/35
       mac: d4:85:64:45:c5:a0
       ip: 172.16.160.35
@@ -669,7 +669,7 @@ stremi-36:
       mac: 1c:c1:de:7b:36:58
       ip: 172.17.160.36
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/36
       mac: d4:85:64:45:07:c4
       ip: 172.16.160.36
@@ -688,7 +688,7 @@ stremi-37:
       mac: 1c:c1:de:7b:26:4b
       ip: 172.17.160.37
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/37
       mac: d4:85:64:45:d5:42
       ip: 172.16.160.37
@@ -707,7 +707,7 @@ stremi-38:
       mac: 1c:c1:de:7a:02:3f
       ip: 172.17.160.38
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/38
       mac: 1c:c1:de:6e:14:e6
       ip: 172.16.160.38
@@ -726,7 +726,7 @@ stremi-39:
       mac: 1c:c1:de:7b:26:d1
       ip: 172.17.160.39
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/39
       mac: d4:85:64:45:07:a6
       ip: 172.16.160.39
@@ -745,7 +745,7 @@ stremi-40:
       mac: 1c:c1:de:7b:26:30
       ip: 172.17.160.40
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/40
       mac: d4:85:64:45:17:d6
       ip: 172.16.160.40
@@ -764,7 +764,7 @@ stremi-41:
       mac: 1c:c1:de:7b:46:2f
       ip: 172.17.160.41
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/41
       mac: d4:85:64:44:77:28
       ip: 172.16.160.41
@@ -783,7 +783,7 @@ stremi-42:
       mac: 1c:c1:de:7b:36:c4
       ip: 172.17.160.42
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/42
       mac: d4:85:64:44:c7:8e
       ip: 172.16.160.42
@@ -802,7 +802,7 @@ stremi-43:
       mac: 1c:c1:de:7b:16:eb
       ip: 172.17.160.43
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/43
       mac: d4:85:64:45:b5:fc
       ip: 172.16.160.43
@@ -821,7 +821,7 @@ stremi-44:
       mac: 1c:c1:de:7b:26:db
       ip: 172.17.160.44
     eth0:
-      switch_name: gw
+      switch_name: gw-reims
       switch_port: Gi0/44
       mac: d4:85:64:45:17:ce
       ip: 172.16.160.44