From a27c54a60225538877262c4478b3354fe9b6141e Mon Sep 17 00:00:00 2001
From: Gaetan SIMO <gaetan.simo@inria.fr>
Date: Thu, 23 Jun 2011 13:39:52 +0200
Subject: [PATCH] [orsay] Updating network configurations.

---
 .../orsay/clusters/gdx/nodes/gdx-145.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-146.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-147.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-148.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-149.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-150.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-151.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-152.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-153.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-154.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-155.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-156.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-157.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-158.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-159.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-160.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-161.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-162.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-163.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-164.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-165.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-166.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-167.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-168.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-169.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-170.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-171.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-172.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-173.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-174.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-175.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-176.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-177.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-178.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-179.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-180.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-217.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-218.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-219.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-220.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-221.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-222.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-223.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-224.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-225.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-226.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-227.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-228.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-229.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-230.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-231.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-232.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-233.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-234.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-235.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-236.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-237.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-238.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-239.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-240.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-241.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-242.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-243.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-244.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-245.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-246.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-247.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-248.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-249.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-250.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-251.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-252.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-253.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-254.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-255.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-256.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-257.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-258.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-259.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-260.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-261.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-262.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-263.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-264.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-265.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-266.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-267.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-268.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-269.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-270.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-271.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-272.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-273.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-274.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-275.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-276.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-277.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-278.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-279.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-280.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-281.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-282.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-283.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-284.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-285.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-286.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-287.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-288.json     |  8 +-
 .../orsay/clusters/gdx/nodes/gdx-289.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-290.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-291.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-292.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-293.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-294.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-295.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-296.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-297.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-298.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-299.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-300.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-301.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-302.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-303.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-304.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-305.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-306.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-307.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-308.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-309.json     |  6 +-
 .../orsay/clusters/gdx/nodes/gdx-310.json     |  6 +-
 generators/input/orsay-network.yaml           | 73 +++++++++----------
 131 files changed, 498 insertions(+), 499 deletions(-)

diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
index 3f57d4a492a..30501abda07 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-145.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
index 41f2ac4eda2..89db8252a7f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-146.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
index 42a16e904cf..a440d065235 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-147.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
index 4d36f99f310..9f4575dcb1f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-148.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
index 16acbca9cfb..99262c34557 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-149.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
index d6cf5dbf96e..b7bed9f9b68 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-150.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
index a0639176287..5fd397eb2f2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-151.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
index e16e445dab1..5068874175a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-152.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
index d3ce5e06667..84123d99826 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-153.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
index 6147176757c..ea2efea3ff6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-154.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
index c088874ebbe..abf277473b3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-155.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
index 3b16fa9b87e..ae23aa4446d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-156.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
index d874cda2e81..3582ea2fd1e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-157.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
index 9b947ad5200..48ae25b9c0e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-158.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
index 574d33f5278..3dab1d6f1e3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-159.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
index 926f45e0d24..ac0152eb629 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-160.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
index 0cc4ac44175..2aa5a531cab 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-161.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
index e5179bce2d7..621dbff3766 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-162.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
index d18adb3df94..7f3c2efec7b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-163.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
index 916bdf11711..7f6e98edd2b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-164.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
index 934836d4812..c36c1daa76a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-165.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
index 3b21c83e7fa..98e29146199 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-166.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
index fcbc53cb45e..06963d53aa2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-167.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
index f1bf69817dd..e103404536a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-168.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
index aa2c41c2c89..2361b0b3d8e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-169.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
index 1a8ac14c8ac..21808c0ab25 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-170.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
index f10dfd77741..77a72f9c57c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-171.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
index 1c1cbeb4c4e..5869cb8d335 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-172.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
index d2b431ff38b..1e0a940c201 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-173.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
index 4476a437ef9..402c0afe991 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-174.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
index 7ec563de9cb..e6f64401d6b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-175.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
index 4008afe176d..09fba8b6231 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-176.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
index d3e843ba50e..60b27599975 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-177.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
index 1a0a7f817d4..3da19df3cf1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-178.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
index 658ee7186ae..50e6c007670 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-179.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
index 30eef328417..e3a7d9d1358 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-180.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve18.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.198",
-      "switch_mac": "nil",
+      "rate": 1000000000,
+      "switch": "switch13.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.113",
+      "switch_mac": "00:24:f9:2a:0e:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
index 5412ca04d6c..5ac848ad970 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-217.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
index 528c13ae170..6f7ead333a3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-218.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
index 0cbd9124cfb..bce3425b370 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-219.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
index 5c85bf1f987..b1c334547f7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-220.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
index 555b487a080..b8759a34d7c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-221.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
index bb5771bfaaf..c878a3f8b8a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-222.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
index 5582a0fe97b..da98536ff09 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-223.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
index 0628f3e0fc0..528b8091f3f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-224.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
index 8e3be7c099f..44acb80a134 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-225.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
index 650062d2b57..66836d4a35a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-226.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
index acb5c6014f8..06b8cc53ca0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-227.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
index 0eeacc4b141..5f0ef2d95f2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-228.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
index 3dde5b072ea..14b5c896bec 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-229.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
index db8e527f17e..ad34ee607d1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-230.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
index 0df4c238e50..fd9f6d58003 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-231.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
index 07b0a512e92..da52b6a7ec5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-232.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
index 8ed69d81bc2..353f3ca8065 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-233.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
index 60fcf0c2718..2436022223e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-234.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "nil",
+      "switch": "switch10.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.110",
+      "switch_mac": "00:12:01:72:cd:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
index f26caab35f9..1b6441db336 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-235.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
index d948eb9c37b..4be4ad6ab8b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-236.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
index 751b17a6f4d..f4ec445abff 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-237.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
index bf7e3cc1c4e..835fe0dc2ad 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-238.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
index 5b1ae84b8b4..4950e3318b7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-239.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
index f2f6f7fb555..36bc71fc972 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-240.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
index 51b26ebe235..5879c65977c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-241.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
index 70bc5dda269..40b0713f120 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-242.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
index 795ecb8bb12..1067cdc80e3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-243.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
index 47ad49e9963..431c9145056 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-244.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
index 47f2257c014..e9e2e1c5c9c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-245.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
index 505ee1c2fcb..25d27f54fbe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-246.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
index 9b49aac5305..7780c98b4fc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-247.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
index a885ba932f3..200a0a1fe8b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-248.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
index 1c5e9ff4774..0b9b4771ae6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-249.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
index 22d874a642e..2f9aca58a82 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-250.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
index 472d66e675b..a780eff4176 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-251.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
index cb83b6dd303..a109d785740 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-252.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "procurve-04-07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
-      "switch_mac": "nil",
+      "switch": "switch16.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:12:01:5b:af:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
index 0ccfe50fcda..137085d1435 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-253.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
index e4fe83f40ca..c880f54797c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-254.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
index 684caf6b22e..45c05aeab3c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-255.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
index d7d17312e7b..ddb2c7c0425 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-256.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
index 0068be08a64..92f597bda9c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-257.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
index 52817cb1783..c2480dddc46 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-258.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
index ab301c5c886..2d6fa1d6a03 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-259.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
index 3b4a4edeb38..cc261c48725 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-260.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
index 21cfb4c7a20..18bbb86a134 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-261.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
index b381cba39fa..32cbd4d0d70 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-262.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
index eae0c1c3c09..49a247b307c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-263.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
index d6b9abd29b8..05be63bd98b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-264.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
index f557121b9a5..78d445ca2d9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-265.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
index 352477385e9..55974c95625 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-266.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
index f0c27225156..db76e05f4ad 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-267.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
index ffd16b38b1e..0ad6bff72b9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-268.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
index be616134608..dc5734f18f5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-269.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
index f0c05e2c526..406e04c704a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-270.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
-      "switch_mac": "00:12:01:72:cd:42",
+      "rate": 100000000,
+      "switch": "procurve17.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.197",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
index e009c2d9004..c8100d3707a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-271.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
index 31389a77f8e..bec1d48099d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-272.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
index bcaf4326a26..36855571405 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-273.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
index 6a00dccefb9..f4d758f11d6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-274.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
index 71c2ef18146..c0abc1fb691 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-275.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
index dc7e372adba..e9e1540b24f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-276.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
index e3b7fd05b58..a2aa9cfb9cf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-277.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
index a93413b58ff..76dd824bb14 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-278.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
index 6fa634b4117..c2a84f42670 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-279.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
index 89e6ce31e73..4560fa76846 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-280.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
index 27c5defb06b..71d9303020c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-281.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
index 870f00013ed..773c4d46760 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-282.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
index 004e4a6546e..7f096d6b145 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-283.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
index 8859b639e42..5d89f12a721 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-284.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
index 54c4d2a6abb..2329f24cc7a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-285.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
index eead004c773..345581267b5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-286.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
index 9b2f0e20249..c821bd3b12a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-287.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
index 6d66f350a34..8615096f855 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-288.orsay.grid5000.fr",
-      "rate": 1000000000,
-      "switch": "switch16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
-      "switch_mac": "00:12:01:5b:af:42",
+      "rate": 100000000,
+      "switch": "procurve18.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.198",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
index 6279624cdfa..ad679070595 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-289.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
index 9c2ff515797..0da42c622f6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-290.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
index 6eb862b1635..f94a3a603cb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-291.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
index 0a5c256f867..8c977bc9ceb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-292.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
index 46885322440..ff6524b2ab7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-293.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
index 76aacff29cc..c701e4bb759 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-294.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
index b492b1f7bef..6b92e0c4f2d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-295.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
index 521a0331698..5f729063421 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-296.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
index a4ccaddc82e..98e5e3fa024 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-297.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
index 26e32e6d059..9824eb1ab71 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-298.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
index 368870bbdf1..38e0f65f358 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-299.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
index 0e40f17fc14..65227b0a71f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-300.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
index 14ebae0ff7d..f98dc38b20e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-301.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
index 2077c372eb8..44a41fc99dd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-302.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
index aadebdb4295..7bd01f7316a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-303.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
index ad9569104ee..caa3a7e7ddd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-304.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
index 55b035340d4..345f85c6f27 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-305.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
index ef624a140c0..8efd9c81fb0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-306.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
-      "switch_mac": "00:12:00:44:68:42",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.104",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
index a13cce2d098..5c1f9818217 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-307.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
index 84645df9b46..bf4b4bc94ec 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-308.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
index f0706365bd6..fc04f6c7f74 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-309.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
index 53bcd56d7a5..e6b582c9c74 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-310.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
-      "switch_mac": "00:24:f9:2a:0e:41",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/generators/input/orsay-network.yaml b/generators/input/orsay-network.yaml
index 024bd40496b..50b8a36b904 100644
--- a/generators/input/orsay-network.yaml
+++ b/generators/input/orsay-network.yaml
@@ -71,19 +71,19 @@ switch-eth0-7:
   next_switch : "switch-gw"
   next_switch_rate : 2.G
 switch-eth0-8:
-  name: "procurve17"
-  nodes: "gdx-[145-162]"
-  rate: 100.M  
-  ip: 172.26.120.197
-  mac: nil
+  name: "switch07"
+  nodes: "gdx-[289-306]"
+  rate: 1.G  
+  ip: 172.26.120.107
+  mac: 00:12:00:44:68:42
   next_switch : "switch-gw"
-  next_switch_rate : 2.G
+  next_switch_rate : 3.G
 switch-eth0-9:
-  name: "procurve18"
-  nodes: "gdx-[163-180]"
-  rate: 100.M  
-  ip: 172.26.120.198
-  mac: nil
+  name: "switch13"
+  nodes: "gdx-[307-310]"
+  rate: 1.G  
+  ip: 172.26.120.113
+  mac: 00:24:f9:2a:0e:41
   next_switch : "switch-gw"
   next_switch_rate : 2.G
 switch-eth0-10:
@@ -103,22 +103,6 @@ switch-eth0-11:
   next_switch : "switch-gw"
   next_switch_rate : 2.G
 switch-eth0-12:
-  name: "procurve-04-07"
-  nodes: "gdx-[217-234]"
-  rate: 1.G  
-  ip: 172.26.120.107
-  mac: nil
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-13:
-  name: "procurve-04-07"
-  nodes: "gdx-[235-252]"
-  rate: 1.G  
-  ip: 172.26.120.104
-  mac: nil
-  next_switch : "switch-gw"
-  next_switch_rate : 2.G
-switch-eth0-14:
   name: "switch10"
   nodes: "gdx-[253-270]"
   rate: 1.G  
@@ -126,7 +110,7 @@ switch-eth0-14:
   mac: 00:12:01:72:cd:42
   next_switch : "switch-gw"
   next_switch_rate : 2.G
-switch-eth0-15:
+switch-eth0-13:
   name: "switch16"
   nodes: "gdx-[271-288]"
   rate: 1.G  
@@ -134,20 +118,35 @@ switch-eth0-15:
   mac: 00:12:01:5b:af:42
   next_switch : "switch-gw"
   next_switch_rate : 3.G
+switch-eth0-14:
+  name: "procurve17"
+  rate: 100.M  
+  ip: 172.26.120.197
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-15:
+  name: "procurve18"
+  nodes: "gdx-[163-180]"
+  rate: 100.M  
+  ip: 172.26.120.198
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-16:
-  name: "switch07"
-  nodes: "gdx-[289-306]"
+  name: "procurve-04-07"
+  nodes: "gdx-[235-252]"
   rate: 1.G  
-  ip: 172.26.120.107
-  mac: 00:12:00:44:68:42
+  ip: 172.26.120.104
+  mac: nil
   next_switch : "switch-gw"
-  next_switch_rate : 3.G
+  next_switch_rate : 2.G
 switch-eth0-17:
-  name: "switch13"
-  nodes: "gdx-[307-310]"
+  name: "procurve-04-07"
+  nodes: "gdx-[217-234]"
   rate: 1.G  
-  ip: 172.26.120.113
-  mac: 00:24:f9:2a:0e:41
+  ip: 172.26.120.107
+  mac: nil
   next_switch : "switch-gw"
   next_switch_rate : 2.G
 switch-bmc-0:
-- 
GitLab