From e0e42c4cd54d8812aaa98610156fa6376943a496 Mon Sep 17 00:00:00 2001
From: Gaetan SIMO <gaetan.simo@inria.fr>
Date: Mon, 1 Aug 2011 13:08:15 +0200
Subject: [PATCH] [orsay] updating switches ip and mac addresses.

---
 .../sites/orsay/clusters/gdx/nodes/gdx-253.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-254.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-255.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-256.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-257.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-258.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-259.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-260.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-261.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-262.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-263.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-264.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-265.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-266.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-267.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-268.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-269.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-270.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-271.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-272.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-273.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-274.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-275.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-276.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-277.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-278.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-279.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-280.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-281.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-282.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-283.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-284.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-285.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-286.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-287.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-288.json  |  4 ++--
 .../sites/orsay/clusters/gdx/nodes/gdx-298.json  |  8 ++++----
 .../sites/orsay/clusters/gdx/nodes/gdx-299.json  |  8 ++++----
 .../sites/orsay/clusters/gdx/nodes/gdx-300.json  |  8 ++++----
 .../sites/orsay/clusters/gdx/nodes/gdx-301.json  |  8 ++++----
 .../sites/orsay/clusters/gdx/nodes/gdx-302.json  |  8 ++++----
 .../sites/orsay/clusters/gdx/nodes/gdx-303.json  |  8 ++++----
 .../sites/orsay/clusters/gdx/nodes/gdx-304.json  |  8 ++++----
 .../sites/orsay/clusters/gdx/nodes/gdx-305.json  |  8 ++++----
 .../sites/orsay/clusters/gdx/nodes/gdx-306.json  |  8 ++++----
 .../sites/orsay/clusters/gdx/nodes/gdx-307.json  |  8 ++++----
 .../sites/orsay/clusters/gdx/nodes/gdx-308.json  |  8 ++++----
 .../sites/orsay/clusters/gdx/nodes/gdx-309.json  |  8 ++++----
 .../sites/orsay/clusters/gdx/nodes/gdx-310.json  |  8 ++++----
 generators/input/orsay-network.yaml              | 16 ++++++----------
 50 files changed, 130 insertions(+), 134 deletions(-)

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 20a03143c5..1ab21937be 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 98132d532a..0e3d710ae0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 ebdcd3eba3..7cc1a0ae72 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 78d412b641..006d688405 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 964850c1d9..36e50a6ef3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 721c7cb731..4a7cc98949 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 518000ab7d..b1a4455fe3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 457c5bdb13..a1c231a9b2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 bb898cdd0c..859c3d12b0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 ac132c4c0c..fa9cd89689 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 151ef2994f..0021c7a699 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 c0b437eab7..abfa6f9506 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 c64cf63cc9..f39c28beef 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 1205842506..334c4e1a30 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 40686beb5d..d171101320 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
@@ -27,7 +27,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -63,7 +63,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 49bf80bae6..3cd2908486 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 a80b10a6c3..586bb9346d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 b6fd9b132e..8d2be70170 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
@@ -26,7 +26,7 @@
       "switch_console_ip": "172.26.120.208",
       "switch_console_mac": "nil",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "00:18:FE:50:5B:41",
+      "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,7 +62,7 @@
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
       "switch_ip": "172.26.120.115",
-      "switch_mac": "00:18:fe:50:6b:41",
+      "switch_mac": "00:18:FE:50:6B:41",
       "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 108eb1d407..0998555946 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-271.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 6d4f001532..9d14f8ac3d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-272.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 6e3c5bc00c..54ce14334f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-273.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 3f67650658..625439488b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-274.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 2bfd978e60..f31f664b40 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-275.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 8b11f6c859..1c310bbaf3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-276.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 b888a53890..3357ab8836 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-277.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 84f58c66c4..ab09b32ebf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-278.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 6f03f45dd1..5eb9415141 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-279.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 ce84fbb9d2..d4352c8288 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-280.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 bd40b00eae..399521983b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-281.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 f002a09495..05f5942d2e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-282.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 bdd17861b9..073cc47be6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-283.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 143f8885f0..f8a636db24 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-284.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 fcdcf097b8..7a67dcdb8c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-285.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 a6e38dc1a1..2c7fc624e4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-286.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 9a16145dd2..8381f4e402 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-287.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 a0914fc72e..b78e9b0ca1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
@@ -61,8 +61,8 @@
       "network_address": "gdx-288.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.196",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.116",
+      "switch_mac": "00:18:FE:50:0A:41",
       "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 9451164f2f..ee9c989335 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
@@ -25,8 +25,8 @@
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -61,8 +61,8 @@
       "network_address": "gdx-298.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "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 f579e37f33..e317f4c768 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
@@ -25,8 +25,8 @@
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -61,8 +61,8 @@
       "network_address": "gdx-299.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "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 71dd46edb7..2e6ab00432 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
@@ -25,8 +25,8 @@
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -61,8 +61,8 @@
       "network_address": "gdx-300.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "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 84cc7a00e3..c486c27cbe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
@@ -25,8 +25,8 @@
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -61,8 +61,8 @@
       "network_address": "gdx-301.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "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 a52f8b3f39..79d5a7f849 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
@@ -25,8 +25,8 @@
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -61,8 +61,8 @@
       "network_address": "gdx-302.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "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 43a630f525..2c6e528b9f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
@@ -25,8 +25,8 @@
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -61,8 +61,8 @@
       "network_address": "gdx-303.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "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 96c4cc134c..5471f27b36 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
@@ -25,8 +25,8 @@
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -61,8 +61,8 @@
       "network_address": "gdx-304.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "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 ecd3d15195..bdd5c61729 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
@@ -25,8 +25,8 @@
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -61,8 +61,8 @@
       "network_address": "gdx-305.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "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 7eee9d715c..c98bd2bbda 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
@@ -25,8 +25,8 @@
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -61,8 +61,8 @@
       "network_address": "gdx-306.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "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 e2eade2b81..6585f2ae8a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
@@ -25,8 +25,8 @@
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -61,8 +61,8 @@
       "network_address": "gdx-307.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "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 f11a572fcc..b24bbfcae3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
@@ -26,8 +26,8 @@
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -62,8 +62,8 @@
       "network_address": "gdx-308.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "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 9af509cd14..7c38f4829b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
@@ -25,8 +25,8 @@
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -61,8 +61,8 @@
       "network_address": "gdx-309.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "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 688f02ebca..5205bbcc7c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
@@ -25,8 +25,8 @@
       "switch_console": "mrv09.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -61,8 +61,8 @@
       "network_address": "gdx-310.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.197",
-      "switch_mac": "nil",
+      "switch_ip": "172.26.120.117",
+      "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/generators/input/orsay-network.yaml b/generators/input/orsay-network.yaml
index f16502deb3..5bbcaa1f59 100644
--- a/generators/input/orsay-network.yaml
+++ b/generators/input/orsay-network.yaml
@@ -82,13 +82,9 @@ gw:
   rate: 1.G
   ip: 172.24.120.10
 mrv06: 
-  next_switch: switch-eth0-11
-  name: mrv06
-  next_switch_rate: 1.G
   mac: 00:A0:9C:00:16:42
   rate: 1.G
   ip: 172.26.120.206
-  nodes: gdx-[181-216]
 netgear02: 
   mac: 00:22:3F:E6:F8:CE
   rate: 1.G
@@ -112,7 +108,7 @@ netgear03:
 procurve15: 
   rate-in: 100.M
   rate-out: 1.G
-  mac: 00:18:fe:50:6b:41
+  mac: 00:18:FE:50:6B:41
   ip: 172.26.120.115
 switch04: 
   mac: 00:11:BB:3E:FD:C2
@@ -129,8 +125,8 @@ netgear04:
 procurve16: 
   rate-in: 100.M
   rate-out: 1.G
-  mac: nil
-  ip: 172.26.120.196
+  mac: 00:18:FE:50:0A:41
+  ip: 172.26.120.116
 switch05: 
   mac: 00:24:F9:3E:E7:42
   rate: 1.G
@@ -142,7 +138,7 @@ mrv09:
 procurve06: 
   rate-in: 100.M
   rate-out: 1.G
-  mac: 00:18:FE:50:5B:41
+  mac: 00:18:FE::50:5B:41
   ip: 172.26.120.156
 netgear05: 
   mac: 00:0F:B5:FB:70:A5
@@ -151,8 +147,8 @@ netgear05:
 procurve17: 
   rate-in: 100.M
   rate-out: 1.G
-  mac: nil
-  ip: 172.26.120.197
+  mac: 00:17:A4:80:81:80
+  ip: 172.26.120.117
 switch06: 
   mac: "00:12:00:44:53:42"
   rate: 1.G
-- 
GitLab