diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
index 1cd4d84f78f783081a4fc5b87a41ffa09c4cf925..a75da1a931494179aab49fcf2794d67af375716f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-1-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
index 1c1edf14a72acd74770140d38f11790d02a2d728..f0aff7c5af13352c123ade7a42b4b6b4935a0dff 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-10-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
index b7b520deba400c8f7dc9c0b938cb58efa7b9adf1..64f369f4787f676f91c4ee502b45d7b49773a4d1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-100-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
index c1258ca30f1a18c830846e89d59bf3afade7988a..ec36795093c731eae393888d9c87c10c120d35e2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-101-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
index cce7b3d98e3ad187b416659eeed20b6233a96c1d..79af57e862d76bf4a005ec58feb96046035e93dc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-102-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
index 4581d140c9049d16c5fa6920da5514f01c527994..de3a37a4ef871bb50893d0e680669c528c58a3ed 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-103-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
index fb7b2710a2d678d551088075a14d42d549e6b55e..33208ad1e453eb503212cbd2fbf6cb6acc40dda8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-104-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
index 3ec258849842da08b8ea984d97140d4ddba62987..c949be3c2c3031a57d095da01b205e192d08690b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-105-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
index 56ad8141a05c2752009c5a2e3469b158e4a20c54..3d94160031bf47fdada9f6fb14994dcc0ffe1b5d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-106-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
index b3615c3f5313e5e3d197ed33f35689cce2d4bee0..d2af3d7c4216b321810a2f5b8135cb2e7356d682 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-107-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
index b1a35eeee0721c4725c35efee51d0b27e203ad2e..f81eff382889365580ec45ca3ead079e89df0b69 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-108-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
index cd752051ed59cbccb29698c9f40991b00dc4ccfa..e45192fcbdd754d0d3e9cb877c697f41b73a6049 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-109-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
index 136556e3ee94d6c78812b9ab8ad37ae9a7a91a50..254783612128151f55dbd109262d58d2a7e68552 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-11-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
index 35919c716d307459a45e3c5b6dbff020d13ec147..c8713bf2d4bd49edef0beb18f25e83cadac4a757 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-110-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
index 2ba6903657ba92f5910ff76660bb3ce4f42f3500..6c3b8683afe1bdd7d40681784891693ce10a8734 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-111-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
index af1734dee5daad90aac7f77a3f62f8a4b4d50196..7c6b46514644a178dde3529ae37dc49cfbe679d0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-112-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
index a0b1fdf3c242792e99ade7204d7a7ed76b619ca1..f965c3a6da07fef78d8465b8187746d2720fd123 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-113-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
index 5e4852780f08a6e521b0169ed3bae02bc12300f4..e122f5cd10dc979fdeb0ff03b9bf5d675263cb31 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-114-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
index e4c365b22532d61cf076af1c8094c4535db3b4ca..2e0c7b78a416ffbb7e249e2348c995754992e807 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-115-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
index e3d045a8817106baac1b29ad96fc4bdeb51c9de4..66517feddd919a9ec583e75ec3c1d6e7b6ab9ca8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-116-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
index e77756b3d532ba3218ec76b1c0ba15feb657034f..759ae7cfefd71957898f5f019de8482ead3f7e35 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-117-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
index 3914e2c0aa02304710e837446efba47bb1a6eed3..13e3ffa1b3068b192263e48a37937725075f6e6d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-118-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
index 30c3693cf0a79ecb4a7b3bf7c1903ed95d1b218b..5f3cca4684c8af6bf732307eae5f83116d9d4bbe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-119-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
index 4b1143d039ed69617ecbb5f633980a59fd48fd45..ff63ebe41be53caac605a3703fe98d27a6690f22 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-12-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
index eeb71fdba0f467f6d8fdde77fd7aa6e8f5a6172f..1059a116d5225fb4f17fcf0473f0954c73f12c5b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-120-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
index 5535ee8926837c6c45181d33c9ac67da71f4ebfb..ac41cc3a3b0441acdbd4b6f07aceb6b63a41ec30 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-121-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
index 3ef45265aa199401d4ddb87c35b10f7f3274ac4d..318ffb481d43774637afd17676a0f2d37bc12200 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-122-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
index 79b84e48d2fcd2fb7b2231e8548818b8e3fc8f7c..0eb5f1064cd3101243eb1e9f0a39bc06d3774384 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-123-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
index e375993fae588b204472c5ac255e61c1378d6fc5..d8140efcb7894de86740e3e4e60fe47d88b886a1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-124-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
index 157710c401a1cefbefe3cc1fa7663e538efe0854..21f351a4394c53a0eb003ce30092ddfb60562d08 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-125-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
index a5196a18d795e2a8f919148f2a2bf26f3dd0945c..7f743d4263ce5c98b03a08e2a26f1be7050761d0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-126-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
index ba1662a80e983de75661874cf0691a805f4f7d71..424b62fdbe5b69d24c812d9a65fd04813371def5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-127-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
index a7bfb5a128568ea4ddda912287b77eabd9e30c38..9fc54dd4f23d1bc49da918753c166e6db72b272f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-128-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
index 57a53a30115f2d5561f8f8a2597460c70712f723..c22114800bc11f4db3947a616f8d2f16db398a09 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-129-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
index 6d02d4f9c48e63786040b8bddbf91e5895d99de4..6d6606a77bc1cae9ebc400c1eef5d1f9802ae034 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-13-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
index 5e1296a42d7ffb4116cdd00a1db7d7a5dd8e1e01..e410a3f941d0c30e19ba6c5771a211162f35e3ee 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-130-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
index 0d257be11b6e10f11f146e3d1bcebca1408615db..a73d1a371d5e130d8a138d5c4843189c4d2d9ec5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-131-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
index dd994b010043958971216fc76238f89bba956cc2..37a9edf97e554826afde279109d754e98e5272d2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-132-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
index 6841d3f1170491ba21da391c66190cfd24b44c81..7c6460aca8990e7e984b13be31cffabd91541fae 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-133-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
index 91b3be984ddaefae9ea9df036dc8c0dbde4ca05e..709da780bb0d126c5516773cd1e9a21f25492849 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-134-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
index fb24b4eeb122cd96a6de4dcc48afc4f530fd7776..1d5f652c7f5906e7f5f56e2439f06f27a147540f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-135-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
index 2f820cec18163c475efebf2d1ea560fcdbd52b94..ba80fd18c7bc0e0afb0a1a0c3b5dbfe6d2273122 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-136-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
index f12148dcdec322dc3ca5d102b834c87d44b37446..63523766aec31d289e90ce6a9e103558955e8879 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-137-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
index f185c56e14291a26163963a46254b91300f7e4f2..b2bf9c1dd1c1b076e4c90a61d34e92e0ebaab1d6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-138-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
index 55aac5721cba6c16ef67189f7aebed09823e6624..3c1cdd831e13c5378e94d3ee952fb4d55849789a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-139-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
index f3d402ac5a4bb7c17b2947892739a049f0e7e54f..0ccc04a954c59d7101e62703997453e56aa33215 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-14-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
index fb85d18ac40890775adeaa5776e96ada93f49b41..787f556130ffbf4fd491c25d6f4b4a0799852ff4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-140-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
index 005e2ef36f988e0d0e9a174bb86205a874ad3726..3870b9beb3342e6ee618ae30924180f50929ac84 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-141-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
index 9003535c9bc322d18d7abfea9b343951b41558f8..46a63562b77ce28dc3cee027434433175a3761da 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-142-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
index 9775db09f611c92ff5bc59c7120fe52915bf68ea..bbb3122cff130e36c06f4d1d682cbdf8f50f4dde 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-143-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
index 920c11018bffc07455c23748b005b5aa6a776329..3d1841f574f75c1056b88d1747b5eb90a78a3354 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-144-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
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 c48de5248378745be148223392bdf8b2da643eee..3f57d4a492a12b1b7387de97a642dfd08a1dd0fc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-145-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 132ba7ae1b4204d0e0211a271a5ae899417aa820..41f2ac4eda20a586d958cc8c117a5fab46b101c4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-146-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 44f354dc2d83ceb5ae8b2f851f72aba3225cb25c..42a16e904cfebbd08f95c01c80d158ffa7349958 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-147-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 590a4c1a2d5c98ad745d9cbbbb8162fac95d0adb..4d36f99f310a042ed7c97801c520c0bcd4499ac4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-148-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 e632c35d186a7495c033c1b5c655ace2d2b4b18e..16acbca9cfb2b83d4321c7d65744616f7616a90a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-149-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
index c04be2a9d9460bf91525178e31cf2229c37d15cd..4830bc6e0a2297f1cf9e4f1703f115088181884d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-15-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 a9e7b9be5c4c3bfb3d73f49df6fcc25d05d8ba67..d6cf5dbf96e0708e4fc4c109b852c5f8b49143a1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-150-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 a6a0b89095e8f50142216b9c2b6bea68e83cc762..a063917628710900e92979ee3132da7a65fc1bce 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-151-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 54054475186f4b06f05820b125589129879d9554..e16e445dab14a830c62bd09f2cd9cb45a7848348 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-152-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 0297213c1497b5d40bd8dbc239f39987413804d0..d3ce5e06667b6d1c82506e0bd6e5c48045d8c948 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-153-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 86315a727a4ebc8bf1489b2638c5cfb4cfd6dbbc..6147176757c907dd002a99e7e06d326541bd20c1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-154-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 44021c8a65eb58cbd15bbe4dce509202d8779bcc..c088874ebbe57ba360760188c5b0a76a68993e7c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-155-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 d1fa532d1cbd0b842da04ab3a42d934e83262171..3b16fa9b87e7ba6af3c9455b81b02f4dfba484de 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-156-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 54c22240c5817b6b738d4aed367d691ae8f934bd..d874cda2e81a6b3bae49c5092304e277ed86e542 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-157-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 3bb89b6ff61724114cf09f666f8e3ee1aea384e0..9b947ad520057d35eeae228d92db00b33a8bbf0e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-158-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 dc8b775d18ea87f05d2363274c70be1d0f858866..574d33f52788cfa77680ad5226b068d46f47909c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-159-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
index faa50e63363ba0710f0e2fe9cee8bff3a6b4e56e..c28700534848628e6dfcee26c3143c6a192eb4f7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-16-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 25ca39764ba5d7768cc9d2765483936d87d091c9..926f45e0d249c51fec27353668fbff779eedb106 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-160-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 6f278f5f15e6b80ac777d45d015c4658c1c3a1c6..0cc4ac4417582af15d7c13d2980570f53c3b2bea 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-161-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 1932ceb6e64b1bcbcfd5a0652a48d4a06c020dbe..84e7228c224a66308dab140b369de30463fc677c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-162-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 f75b60215255650c3a7d1bcea640f45dec0c4595..dc5141700ba5ade4ad1d9d0649f1eb3c9545d8fe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-163-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 ac8f6a31430aacc748d1434bc88c6ac243b21635..640abdaf2e367409e21259b21cdb1efe9cebbcf0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-164-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 281b49b60fe832b890b1947ec1f5c5e79e589a2f..2ddbf8d214ad2df6f87fa7179d4b2f3c4511fe01 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-165-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 3a9817e4ef80f0155be4e97a29ee3e9da399aa8c..63095a4f7e379d6840b25d4ae4603262936c6503 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-166-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 8b8e2c5861ff55c4afe04de2e09758db0388d95f..bfa62c3ef31f73ae896148fba760d0dc68da421b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-167-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 e6ef895dfb589c1921ba50cdc30aa8516d3cab52..029c6e8d4604812d5cd2f2f9f3fc076416f786b6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-168-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 8d3f8c3b988b88db35bbffdadf7300ab7cf228f3..e23242d131b64114def25ccede9d492a3ad52e53 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-169-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
index e10f995ddefe7143d52f582c365e3caee07237d7..c0a21b9eea0e9c983d0409a4d823ad87ee2a8bad 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-17-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 62b00307e0f9683b86e6e33a261a77c6e15ca322..f106bbe92dd861f02963a10b617a20b3d80010b7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-170-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 7212054fbc09db598264902f8349bc02688c220e..3618a0267ee339a53c88b54a5983ca4c1ab93480 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-171-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 128b02dc993dd319fca7352c6dd577b8403b80f0..7dc874d3f565a68531e5f2e956b471c197c45f9b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-172-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 ea5b269ae761837d357e9e05da2c25e9ec660073..d032724bdc6c69de0eb0efb0d36a8f0687b4e1ff 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-173-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 1d8692bfb06b3f5442519b8dff238c66135e223e..c0ced9fddf0568ddd8a5bce64571df99f6d6a074 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-174-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 47ac8dedfa9be0c139e55da1923d4265c6117d85..f9f7a5dc6827501b66cfacac5246a0f6fbfdf710 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-175-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 86e8e6f630ed3587383b353aed12bea5106782d3..b5c640da49c62f9b1470ab6a13fc83b405abcd22 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-176-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 6308c8a0c85f89ef9efc968eefeb7923d7d36b05..9165216826520e34c37896006029b9c6c6ba465e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-177-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 4ed349cbb719522ce4d61f9dce753a8b7b0d3f31..03cd7c62d4dbf830e7844d790e836b6fbcec5ddb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-178-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 4fb7f26e8e796849e2fdd624f55f075454611570..a764d686bb1861d905dd12b0f8287c56e4e373f2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-179-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
index 7659f4490eed71859e0ce1b59740353e4eb08641..6d8d40ed8df39d49031b1110ee460f7a9db13161 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-18-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 e00cc3100473273fa3acfcc271b5f08463276f19..8ca0b287c4f969be987a5efe02b38a6957e28674 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-180-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-180.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
index 7a04a1bb62632de251a1ae9c69e00086bf7d7ce5..7db01c3060dc5cbde6a63f3b8b22d0ca2b69dc0e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-181-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-181.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
index a9a825b5f59b793bb728e2be1ad23c1de3213849..c722e6de581b446f5a02f557c6a2e90948fa4471 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-182-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-182.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
index 858bcdbb4aeb4fb2ac221ce4db863e9204fc0bdc..e5243a4b226818409241702e4b278f820eb1c3d8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-183-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-183.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
index 3eef9c7345d561fc35b12ff01778046728b21bd5..39ab4c8b9aa1453b445b77ed433a292c0ba1ee44 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-184-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-184.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
index 1467f433066596a727de4321a97b7377d9d38962..ca3093761edad2030f16ca2c73d20194b7885e91 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-185-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-185.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
index 1e03b3939760434053bc58423cd940577ade2362..cbd9aa351ada49f1928524f26481e7c11c194108 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-186-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-186.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
index 5dc939afa5742416ab7ef384614398ba1b577fd4..2fc255ae88d21a5841842b8e08c8b1eaf009bf07 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-187-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-187.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
index ea6070ba1e96f2ffa867d18c7928bb607520db1b..13f29fd1fc650d9d95a3fc5f15914b7b127e7eb1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-188-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-188.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
index d4f3f7481ab6b65870fb72fd54a97f60f9dbbbf8..bf9066d4869d5c764cbb862d8768737e10dec7d8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-189-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-189.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
index 826eff69773b3ba2d2ee0f929f44ac0c466c0696..2038b49bf2d40db581c265e2693f06a457609684 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-19-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
index ba0030cc6ce4ce4703a441d67200a1f41182d389..797d9475e2910ff8916b90c3cdefca5350cca067 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-190-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-190.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
index f0a0ddc13868a588b3c04c454f8a7d86b88dd2ea..abe28a25c0ca2450e300c75ae287ca2ead89e3f6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-191-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-191.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
index b90754bd65cc92dd4ff6aa15e9aca3c1561e8a10..09e2760e45273741d5420df4cbb3680c33318bca 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-192-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-192.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
index e16aae24163fdcdf621d5320ccd0178f20ad0040..b1b5a9bed6dacb2a944158ddc68acedb705cd000 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-193-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-193.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
index 630883ac0e6320ac8fa6df780f939a8fd637412b..3a7f47a95abb183efd644cb32444e45c7d58f051 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-194-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-194.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
index 44a6b453c637b71ea0d1ec91981d7fbe541841ef..eb89fe235d9de3609a2e5ae156985330a52353b0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-195-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-195.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
index 826ff3bd174f95486738a5be67b3ec7442e8c4b2..636688a696bebc2c3fdfea0f81c8ca4adc5c7659 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-196-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-196.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
index 67657f042b58a00db88edebf67d159dcfdaa5adc..c1feed81e8bee0565cfc44bf3bd377bd0f86647c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-197-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-197.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
index ba47209830281780c41469c1c3229bf320442c41..206bb4fe425a1e3c3f4005bd1ab6091a58c41257 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-198-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-198.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
index 169bb9668f06616c27c44b311f99ea15d01f8d51..bc86a795f478dedf1899f85b69729eb9447f1a85 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-199-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-199.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
index 1c6cfd5a7c2758f011af727c0a37a1a184ce4bc5..0101c216e8d6052f84d8db1b3e33b6a5e8117f65 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-2-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
index bfcf953cfa52e9f152e1367f71eee96bf83c9385..fbd765e022ffe9d1eac97deda0c52f536a75d6b4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-20-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
index 0ab4a43ba4d865687745eb7cdad7d19d3f481147..a97048b4e3b71236d23c6e2549294d558b1b7eae 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-200-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-200.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
index 2e22b2e7ac1c8a409774c9b62b4e4b3cbd586460..150ef6ee5eca0fd85f16614782c9640e68f92000 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-201-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-201.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
index 92dc9ec8abcd75e37393156d6c1b5134d8e3c37c..24bcde1bfebb2048d1eaec615fa2f1736b229a5c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-202-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-202.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
index bbf16c659f52ee57826999a09caeab2722b24da3..588a4409865c2c9643f29de0af02978a6589f395 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-203-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-203.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
index 3ecd0e5377e7bfe7e1c1ddb910efe9a3f89543d8..4e12145514293bc2a0465dfbea1ffb6083a19743 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-204-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-204.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
index f2a68b58c05d729ca5b1c85d0d27f178d7269dd6..b23555faae36add80a7a88f0478e775d76e0f6a3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-205-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-205.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
index 5d5e691d701badf9bdb43c1f74fa87ee668f9de7..ca219b2f82200e8a7276278de492161b5f06db9d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-206-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-206.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
index e11ae72db50491e9da31105e5496663f4ccc7eed..5bae7f205fa17c1b17984704f27b0da89ff1e3da 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-207-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-207.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
index ad285046edfcb1aa2e9c06da3e65fc4a07051cdc..e3c965ea56e975e577f860d4a842953879494ed5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-208-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-208.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
index a669307c4f612dd2529a717887e2aebbc46a4d31..6bafb0da31570a182c63bf9697d633fcc2c4bd5b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-209-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-209.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
index 7ad8f3736c581b9bdb5515a1ca1c1a919c900b2f..a4c33648d1a7e51fcb47f1b987f2ce808768372d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-21-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
index 0330ba2630f5aad94d19b10b9ef7feddcffac9bf..904c273df35b2b007a5187d7144eaf5f5bb879e0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-210-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-210.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
index 6368904a180040d09d499fb1db4f935a3c20bfab..9aca10c1be8f88aa731332ea5c77983909954c5e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-211-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-211.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
index 0a5d2bdda3243d2f90b47a59dee9716d12389ad5..4bdec8b9f2a9867e04d44b407cb7e6687af85936 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-212-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-212.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
index 43811ed41d9dbbf2c122153113e22d1cb62e953c..957d3f348d4dd8a243583939e3400899c8f9ebfa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-213-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-213.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
index dd03235c361c458c4b4aeb4ba05929c2b685fb27..f63d0a46d1ae2a696fc9921c3d899def930ab9e8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-214-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-214.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
index 64198b7b2e9f724d61ca1e3f34365c02221ed031..61052cc885fb80dacd51df1bb3cc80dbec24188d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-215-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-215.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
index f71c7408ec5a1a5653c6767310e6ffbcb526d2c1..e939c6c9637a89d546e9cb167d82c50898cbd78b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-216-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-216.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 b11eca5c1376edd3bc1262ec4799a145f9ff61dd..5dec63d003b9ac96f79fb2b12487bfb98ea60a79 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-217-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-217.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 1b9ad5ab5d3f085f29de257a23fc28e951aa7aa2..2c60764e1aa00649e1a292688a23d937a4d51712 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-218-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-218.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 55c5dab446871a71e97f03d800f374d786a4321d..876f6fac0ada5ba98707b4e2721c9ab0f2f9ce60 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-219-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-219.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
index a5c5dcb21deaa9a216cf206697b347b0ffc8747a..2993be5a996fe13cf429720a60923b9c28af1894 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-22-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 431e63dec146f887b5fc07f825bb596ab167b174..e43d6756ae23b85ffa1931b1143df09b84737048 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-220-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-220.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 dfadf6c27a27976033c0d2c8c9a89d52ffb231ea..9f43f8ab19d8cac3c36850f61157c173521ba4a7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-221-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-221.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 efe03a428b303d92be93a7ae0339bf7e157e8312..73da3e709659c632f7e0e5768b1a76434409cf04 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-222-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-222.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 6016cac53b7ed7405733353e0b26e22f448f26fd..29cdbd07be3ef63bea8b3ecdeedd3d7597dd339b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-223-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-223.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 0b7c7b29f58b29fdf018069c731a4127c49faff9..19b0b45b324cb7e1025f4030bcce6f5115e225c8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-224-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-224.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 66786567c7b54567f3462a9591f49fde3554ed59..9ac1814d1e3b470d207159839713eb46fc9dc460 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-225-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-225.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 98ce00a6ba30805c3e5fdfdc3a3ae05d2f9f2cbc..3c46537fd9b3952a6e826ea7b474063941d1c823 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-226-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-226.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 70d640e2e44dbb28ce22b2678c8f0d7322bfd235..7e0e8b35702c577a53456b526142d905094ff01e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-227-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-227.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 31eb4d1bebc1f36b9a7dc4b0d68dbd9b2570b5a7..3996f989772ae584df424c0a1721d52cd39825ad 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-228-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-228.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 7d80ff6d57c53e272bbf379168997c0f31cc4353..4c81d54404fd355939b884556bb3db20d4fdf312 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-229-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-229.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
index 04d7f911295b56410b0c34302d402b9f307fb8e4..e4cb05d3b9e635b8473236d9ea41a1062ba3c7d3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-23-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 3e8601723d4347dce9beab8c9755cbb2da42167c..5edf3bbb3791958be76993a7deff3161b4139249 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-230-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-230.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 71abad7941288253432297d33980331049f3c8ce..661ca0d4436e47bc89f2fc42a218f825f66bf521 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-231-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-231.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 ac5921a08e0f3f0fbc0fb6e8ba6939e804f334ae..8fb9682d832424012094133f45014e143803a385 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-232-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-232.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 4de1a6e29ac8b75655e55ab98a2e712ba9930851..e090f6b99eb580bb4245d9bb658cca8541c25d32 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-233-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-233.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 b8af9d56cc3300559ecb097b99156912c3792a92..681fc788cfeabc803f0b3d90bae14bc87d06b746 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-234-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-234.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 33afd28d8a9f54227a2ebbb2d3a24e2c16ef5250..df3c4fe8538ad36bb6439dde3dca86ec439c43f7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-235-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-235.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 f04fd20c5a2a72f021e508008f6df22bcd1e9a14..d948eb9c37b803b22768bf6456b544438cd1a348 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-236-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-236.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 0170619ad8daa469b867ff1000248a96da5e8b7c..751b17a6f4d7f79b7ea2bbfc2434e5221d038686 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-237-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-237.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 9be509e83e36f56e945c1f741092a0449452be9e..bf7e3cc1c4edf276bc77ddb591658b4a43286d72 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-238-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-238.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 d65901b7bbac5ebe2cabc143de6d3b27f2a39397..5b1ae84b8b47fdfcfaeb9666a5de51b917b7023e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-239-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-239.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
index e8478490bd650aa5a2d6458e3753a87d06a69a17..52035dd9acb8682444814b88af187f1fbdb3e769 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-24-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 76c303ed3b8441a1078f8bb7ae17da20970a6fd7..f2f6f7fb555e4bdb387b677a7cf36ee95c7fccd6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-240-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-240.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 2e96a704baeb854592f9f878f6b124f688cd44b3..51b26ebe2357de7785a339a6c0bb87ab48a7a433 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-241-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-241.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 6f3aec83cbefa6e99e9d2a72196e58fb5358247e..70bc5dda269f03b8f520933f14be664876ad5444 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-242-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-242.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 0750ac7d556a68da01776cac130d78c4792100a5..795ecb8bb127ab59018d31a66252c38fb4e1b08c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-243-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-243.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 6b15f26a89dbe688e0773eee50c4313977cd90df..47ad49e99636c452012232d224d8ec3962de9159 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-244-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-244.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 d0f8ec7f4aca596b6404a060ddf45ba8ce4dcd11..47f2257c014daababe96f6c632791098114ea659 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-245-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-245.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 8fbc462d575b7eb38067a8a7a1d4e184448b1fb3..505ee1c2fcbbcac64a93c7260293b32e5d02d562 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-246-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-246.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 966b5b7da7c669e901467ca348d897825ed741d0..9b49aac530531f14393f76ffe55a72944c51b7bf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-247-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-247.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 f8ff501b39d336d59e108ab26d5ec2749f35070c..a885ba932f3b1203fd1857d46650dd87e8d7fe10 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-248-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-248.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 4f4740411312502814e1e71c740e06fb000d8a7f..1c5e9ff47742b2577e2cee957bbe34384eb7976d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-249-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-249.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
index 82998a09f955e7b02f2a2544f7eebe6b8c23df2d..706fac3bb1890c9bf548c18b1e287cb07908950c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-25-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 5cd4acbd87042c285d23dc9c2e077c92eecd5b70..22d874a642ebd845a3058c9ea4fc6a22d5579297 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-250-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-250.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 b465d483710ef9ef9b2754f78ab18ba809a567fb..472d66e675b8f22867aac033d05c79790d841b80 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-251-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-251.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "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 01ee7a09f47ef8becffcd5590bda76e13c236743..0e34233fa08b4b844d1c1e375a0d43b2e98086a9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-252-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 7ebf81085947a5fea0eece84c3f48c2818ab4553..0ccfe50fcda434f403cd093895a52ed83d6773c1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-253-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 f16f265b682a30f531074adc46d6b6674aaa8f24..e4fe83f40ca44e9ac1e17eb4fc91c6e79d378665 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-254-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 83e2e386083c5f10769522be9caf7afe850ebcb5..684caf6b22e8d0a6306b2eaa06922d8c30ee1ccd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-255-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 dd9cd42d0c1cf447f644640086e22c995e1f1fb0..d7d17312e7b362606ccac7bf026b6a52fff11d54 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-256-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 60fa9c322281fcab6dd95922815a3558c6d7c7ea..0068be08a6457c4b8da3aec9066c85c8cddb0ac5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-257-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 2ce3d83c54e04992f92348845cba55e67352c607..52817cb1783b44fe2ad59a103dab8b001e825584 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-258-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 299d9bbed7bfbf3b616047e395dbb1730096051b..ab301c5c886c18196d23f61339192035cce84a29 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-259-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
index 87d0e94b71d64a596f68637d38a55ca2a7cde20a..8ba08f83de2f39d7c74c2ff303dff80c57b916bc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-26-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 a83402909be95c161957ac48bce6b9763e2e49fe..3b4a4edeb3880e526a97aa53786d04f9e4e97ab1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-260-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 846528da26a1166def0f67d5fae4c5ec619d98af..21cfb4c7a20f0c94d07f4e49d3f48c6b71893e97 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-261-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 903aabccf1a466f2b292687767b9d09c4c1f4dc7..b381cba39faced86ce18412380b14a8c6c4d3481 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-262-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 5ccbde6c6b0969c34edb10765b3065eb1f0a11c8..eae0c1c3c09d07df903818d2b7105d3a87457ce2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-263-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 8c7ffe72d581851f5637237164ed3ecf41601f0e..d6b9abd29b8d7f50e33001b7c770489433149928 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-264-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 5ad26b459256500f318b4ccfac5dc9575d5104f9..a77d3570a18438064b4746674b13aabe629b9ab3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-265-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 d8f0b61373ba5bbed1613008c6b79e4bf6061b2c..352477385e9aa1dd948faa1a00231a9e047ac998 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-266-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 a1379f485c5dd2f681bb70d16998ad097199e1c7..cc116764a512c4443324ed76b954a738c5a612d8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-267-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 b41de909ed73f572421322d5bba97f448a85412a..ffd16b38b1edbc47fbab385e19e58cdf3137f9d1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-268-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 15ba88c45c209d81a95588157b09042998d88d15..be6161346083721f981d1b42cf3f22c05c283bd3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-269-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
index 34f07fdb58bbb19b85b432ac5d338608e706f7a2..19389f99ba534c63120537bf50d9d03491c76970 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-27-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 20f120942d3faae6da7fae2e70dfb64808528fd7..8091b94ec654a7eb6f899aa0f311cfb66d8e971f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-270-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 26a9807ccd3e9bd3810a0c0c931967e00492b78c..e009c2d90048fe09db6f36334dcd0544848334b8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-271-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 6ab5fe223335ba4b029fb0c62c4053e01781d6bd..31389a77f8e131300c2fa0e308dcaf1a2d508d5b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-272-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 a99675470446ff0bb94844281f27e53643cb4625..bcaf4326a26bb686b08f28428e132c118fbb6077 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-273-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 42164f172cd8989f197b5bd5d6371347442a395e..6a00dccefb9d4884b9dc99ff1b8584aaf3204a19 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-274-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 2a2df7583825364fa8489330b9b98994439f8b4b..71c2ef18146a13b909c52752a1be56003a35ac9f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-275-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 138e6dbb81b315aa5374377d7649445f8f47bd20..dc7e372adbaf85502e04a037f024820b6e1f0f98 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-276-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 d37e037b671f5bfcd785ecd5c6f97938db899914..e3b7fd05b5865c4b2ec78fa6ad1f5d2a0a1f812e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-277-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 83369646189edd2f81e4d0262d8d1e3025ba68b3..a93413b58ff69928e2a0b4172df29d82d3e516ea 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-278-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 a4c4eac904ffbc9ebd4f4b881968f85055794b5a..6fa634b4117411c18f87f349937af31723c1676d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-279-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
index e57e4dcdaa2e0f67869cc589fc8216f4622e5686..d28152013cc74c06c02a563786cfc7b657baad5e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-28-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 e8e5f85615bdfc21e01709a0f0e4de35e92d2562..89e6ce31e73938e819cecb60f7750ce8f12cfee9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-280-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 41d8ea1913872c03144303abadcc237d44b747a9..27c5defb06b1064c1007a40d209ccce80ec65a17 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-281-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 b53fc878e575aafb2764cfa63e6ac593374f0a44..870f00013ed6e220040209a70c5bd859d6e62b22 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-282-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 23b7f21d02d32a83433b761f36103f0e310031c2..004e4a6546e0253c9204ec65944d463d913ef42c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-283-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 b03361d1b6cda451221baaf49c2e6d718a30fb68..9946c090c7fc811a1f65b4f68fba9b69b836bd11 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-284-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 bb62649f744079d57c93ac9f2b616a49410917bc..54c4d2a6abb10e6a4eb8967616ed97af1f5e09b8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-285-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 af964c76b392573ffb2f5842ca3c646bca5ff982..eead004c773b1861a9eebd1b48de0cb8597a3357 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-286-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 5c5eff64937856ba9603f98b461d27433198e92b..9b2f0e20249ab9e0e0d8bf378601c34eeba0e53b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-287-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 5f43e601dd3f259a8408eeb3d80d36f325ab860c..f5bade2fe621a3ebf7ed4b380b5ef2b2e8f13690 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-288-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-288.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-289.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
index bcfe33b5985f3ede5ff4f36ee4e0e8ab04d32d1f..6279624cdfa8e9b7cfa3708f65d12ab0d86ff568 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-289-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-289.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-29.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
index af8a372d77c2efb5f427ba858e2e956373199522..17d8f2ca59f90aac3a58d76dea6c20f4d0bfe782 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-29-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 0f454fb1123e7506df8bc82521b233eb2f74c7b6..8bb1838ed7079a532339b7acb60d1d6aa27d394b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-290-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-290.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-291.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
index 20274b612662e4abe9d3fe826478fe8fae35d598..6eb862b16352d16a169559b8f25e0125d039ef8b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-291-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-291.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-292.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
index 76acc7f43ca87bb8e00b0923914df1b89a857f3f..0a5c256f867ef9fae7dead245aedf99a3c982eec 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-292-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-292.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-293.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
index 7c2dcd9be7cf099db7995f39590ac9fccc5dee3c..46885322440fd76bcff2d0452891789cc13e4b52 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-293-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-293.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-294.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
index d03d70263bbc96aeba242b95501d4eccd58940d0..76aacff29cc241ab250feb59f27108af893d9123 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-294-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-294.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-295.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
index ff706f7dc3a4b681a3ca25ba09cc640cb85f5e84..b492b1f7bef6bd66894e1b1cacee22113946cf04 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-295-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-295.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-296.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
index 1cb1901b541418ec16bdb8b50ac31d6f160ac483..521a0331698c976412aa22e7d2f94a76b9441001 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-296-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-296.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-297.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
index c4d98c6a4f6bc19129a1b28494102472bbddfe86..a4ccaddc82ec122b7688c2aa923f49a9fdeb4cef 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-297-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-297.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-298.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
index dff3f58c9331cc96406012a01336cbe3e85fac04..26e32e6d0591e5d20655981ef2ce06a52d48f25f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-298-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-298.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-299.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
index 6753676d3677bae4c3709dc3a54a8b08bed54b16..368870bbdf153550c259955daca3a08af7bff0c4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-299-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-299.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-3.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
index 627e224cf60f1bfeed81840743f6479e82bde43a..02f70776f27a6053a196b6a4ae02a3986430bdac 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-3-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
index ca3e2e58aa9796ce3e02ba9ce2242b1710844b7a..79c77c1ea7740b18ea837d70e76da26980406a83 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-30-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 cdc83e81e93ac77bf0b80b0f842f31dae9d9a60e..0e40f17fc149850c9816185f85ec6042a4d34de6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-300-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-300.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-301.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
index 469bd32329744e7cc08f67016fff3feb54e82334..14ebae0ff7dced44c5f096f5dfbb9137eb29aa73 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-301-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-301.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-302.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
index 492f25431996f4edd55ec020d80d49451fd86e50..2077c372eb8b1431c6853b002c2930c545997e51 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-302-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-302.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-303.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
index 0d8e7fb85d6e4b1a31318861c3eb2ac344209165..aadebdb4295c9366db071deab06a842e351e1c28 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-303-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-303.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-304.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
index 1a240b91c37055a340aa31c278d889e59bffe7e8..ad9569104ee6e166165e863acdf2520bc98022de 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-304-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-304.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-305.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
index 037f136f8a03c2dc5549bbc7d348af2d19d59365..55b035340d4ed4b4200486b3177a3c7997740bbd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-305-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-305.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "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-306.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
index b516ef72911b71d4eab2c7197d3332ba4eb07377..a92f2049aa2d1a9a083a6d3b3baafb1710f44204 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-306-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 c3a991fcef70d49d2c21d0cb5effef22f556226c..9d4ff9a5f8db195ec4a805a20c222cbd4fa7b09a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-307-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 5b3a2980bea23e6a3b8391c385dbb83c16125eea..64af42de992b29b9e5669e890b7b88b7ec8c9aee 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-308-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 3d8381e751e91cefcebe2e365fb1936a9e1260a6..771bda48f3653cdae12ea4c3cb6555a82ce1781a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-309-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
index d70c10615aca61c67df1efbf05ede417210f5c36..b56c3872778e4e7c6df1dee9301000c97b88e894 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-31-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
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 0a9d84713e24fad1bd56133cf1cb365f6eaa49f1..a3fd5c346d90f5fe2946139189b05147dfb71ecc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-310-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
index 98eec5587a0578e81166a2f9a73d972a6e876adc..fa7921fed453193b708c091627df9ee239b592fc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-32-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
index 2e24a7e103f57774ae90aa39f07b3f9685e5f3bb..cf8fb062fd63495a0733f05875bd2760fadb4045 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-33-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
index 0fd7ab4849a16466eceab7a18b0a5ad4a9f92d05..4b878ddd0252f4e1d2063596858b931beafdbe35 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-34-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
index 97fa3740b19a70e2103605b3f5f7f28e8d6c5f1b..2798d9101c6fe4a66118ecd6229c44f19773e2f8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-35-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
index 281b7fbfa06997668e29f2b193491b0fbefe078e..7ed2805ee0d8ba2fda0243bd28ea2523e16e40fa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-36-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
index 3b4df3488249f9eef7b3713e97621779e1a846fc..5581e9ece9c4e1789e5292727ae6c6749e1ac5e9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-37-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
index 47c7a8b9e72e67fc0ad763569df040b28d573a65..127001a651fb78fc8f7732847f637caa0293f285 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-38-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
index fd4662210605c9ffa91a5fa36a5fed38d36e7d89..885e936a3f988df6bf1eeee4cdcff9626f93c775 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-39-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
index 1ef31692a5037f05732cc038d33aa0af1fc51e54..ececa24aaaa2c4634ad39eb8127f6362085dcb46 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-4-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
index 0b4245afe234958734f9ab75077132be516e6a63..9eb7c0bf93c79a48c78386c04bdab201b4624ef3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-40-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
index 8fedb2e1a3be019c3c7b0da49088210fb695117d..81fe964e10f3c2765f5bae8df2761d6eee398193 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-41-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
index bd0f0b32fc8dec62618ca6b89fcb809144f51e42..b2e547c6d8428414970fa85973d67008e98c041d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-42-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
index bd71ea606848177ac8d8a680abd47788a256bc29..d5dcf8edfe1ef0565be43c6ad626798dc84c7965 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-43-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
index 4002362bf6038c326f3d7a55fae171b33eefa84d..354f54d403d486e431801fc22215a0fb8f56fe2f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-44-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
index 8dd81e607845a79c585c91e15b03c24ddbbcc07f..823ea91eac81198f0ce037776d03316f053ca60e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-45-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
index 0b980bfa428c2986287742e17da8efba3ec70f2c..a2fabd8f1f24d296b9d60d731245b89ca1f73289 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-46-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
index 8c210df9bace01361a62e686a4cfff82a567f99d..ce3e70a2f7209d26348b8c5a8a34250f8954bcb0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-47-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
index 84c42d999c86aeb5cee4e2ceb39357852e9856e8..e892bf6fd0d86576fbb7e4fc9417d9a3829333d3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-48-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
index 14f293d9933c7123bf0c063d2939faebd2c8d87b..d1a0ef68bab899848dc44038e55aced0b8701754 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-49-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
index ebfc40f833a692d84a42624d2bf39402ed23cf0a..bd97d69838c8fc9a095ad29584b1aefa4aeb8773 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-5-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
index a1dba07e5dc433c91f64005b964c0a9a602da9c1..636387ef0bbb1b72bd0f8f4b240bdb469bd92ed4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-50-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
index 4c3994d14ec8593fbec4fd5f74cc83640adbacdb..54cdb55a2b9705dc0b8add0e342a32d796656aab 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-51-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
index b89c1e0cf0b5f3554b6b05a4857248e80cc2f864..5607a2bba65e4229ca0e7ab1ed584032181066fb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-52-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
index 26a35c6a45bef667e875a1677e388999593e0e08..6e36683ca42394afd5de5bbdb41407d29d9e3487 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-53-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
index 14f0e3649e5139744ad7bdaeec8a0d5698adc78b..0323519be76cbd19f26e84e38f444278a700200e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-54-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
index ecb9c955414f0b28f27dc68a664dc0dab5db2d61..0ae8e9d0462f68e54f0b90416fa3357028c4b8e8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-55-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
index e02e20fa53aebe13a8745c1dc5d0f2b3cd9ed4a6..fa5e59ceed876ea3fedf739d68a343caf131f6bc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-56-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
index d868e1ff0b1a247fa7b84af7e907fbd93325c3d1..22187f8a404257b1428415b5a3d8e2b86cc7f779 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-57-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
index b512140d925eedadb8c5cf85d0050755b5c2a468..d755c747ece62b77add17dc1c523999c16050a0c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-58-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
index 85674f9cdc9c53463acc45935bf9c87b2304d888..9c930dc9f19fc42e5ab76015ce0e20dab8850d5e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-59-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
index bba097fd0175919660396379edab58972b62c4d4..da0b41c6fc8c9f5f6f474c72e3bf83ac0452f34f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-6-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
index a58469891890110fa59d16eb0c9479be8eed1f5f..e7c11aeb12849e4727086c2d9153dcd81655cc7d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-60-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
index 30255238e2691763ca296b8b4a18f9f26bd4d02a..d4960375e2ace8123146771abd65e786087bf68f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-61-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
index 7fb6c303b9b9b93a98631f307602c0c2e930a4a9..d73c4f70382767b9a97794d8a35a51ea06f4ae0f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-62-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
index 232409f3486cd84a2c9cda5b88e0349a1846ebf7..2066bbd7331d61172e4eff8d1b6a6cd18187b3f5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-63-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
index b3fbe857701b8f892dd585878a4b1c6e204ec06c..574828e58f05bf767083b6b21235f4b69ae0c63c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-64-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
index 830c684cf6f0a54c5d18466a3210e8f7fc65c827..b23165ba030c1e3bf924250f6e0d63a5642dca93 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-65-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
index ebb4c510919f3415dec3f0361d1f189ae3c591f0..827cbbb10da7acf7ab92abc1b70e2751988d8007 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-66-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
index a9f7a27c4476a7c6ea3221cedf8869132e6adb45..0359a19c4b5a265a1ed41b5e2d76db258539e9d4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-67-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
index 864d28a482fca6db46e59a4cf70641388046fab9..bab5c81905272ec21af388951b7b1df55f590797 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-68-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
index d2b1be413216a3ab59c30bbcc35fa7ff00acf040..69da6131e6e87adc7fc35e7f1eba620241cf79c1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-69-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
index 149835995face8810a4ae84f24fbc9c87c8bc54e..b06ec33e67bc7d5fcfee6302054bbd9d8a432722 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-7-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
index b514a55f54a512fd40abc595eb9e4507445e9e3d..e0ebb78bd6130c8230cf05300bfe1bc3d0294d4a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-70-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
index 88475826278cf785f2d725c27c5a7ed2cc4a6daf..94432947e5125a1a0073b7bb06789a4d9e1b46ed 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-71-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
index 384d7048dc266a63e59e2cc2f8df143379faabe4..5e5857884005794e8ce7c87eede0060494cd2d65 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-72-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
index aa8fddc3a593d61327dc3d3242d7a838c353df9f..4b4c55ed31255ea8d479551787cf4e79d678fad9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-73-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
index 0bf2d0f1c4174b3b9e0cdd6d3afc4d7251569d68..10bf3393b818344d757e1c4fa59a983dfdb92eb3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-74-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
index debb63ba75134726989f1127d272d5a9040fadc4..42a1f0a43cad9f736169dff0cc1baa90396b5394 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-75-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
index ad8f4445cfcaf163ca1362cf07ddf855d7ded8c5..9efd4e39ea4550a78c4f83d992afaacf6036ed1f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-76-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
index 68d8cf299ca9785eae74b41650649e8440d96ab5..9b0750daaa42ae81c566d42f30d9f3a180fe0bcc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-77-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
index d5fa1baf0ed2ec9237376ad49769dd833b887ecb..0ec0927622c66a04b520165f470a18dbeab4257a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-78-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
index d1cafe0165cd13ac233fe43303f91b7decdce67d..0ec57197e46c15bc1918609f248b5137c690a870 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-79-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
index 19deda28be685dc7dc8c28e8ecf304005053508e..53e6dc2768e1dceae9f4cee4cf58ad0bb889d251 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-8-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
index 768359c90b4d891a9acda21b49f0bf0f8d03e960..633145345ec38f66d72af86e1bb5f8635d80c437 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-80-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
index 226fc361bc4c6c37bd7e79748cc3b7cf4b466132..a0d57b19932583aa5f50eae250596b899f0118cd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-81-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
index cf023382bffeb8b3528701eb18616d1ec09e493e..c6d3038b77525e2d1ba574dc3e260c5076aadab0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-82-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
index b2c9311ca5f48805d9cb4ae6daf386decdc8f53f..9e18920bd66e162c25ce46dcc95eb4f829bbdeb1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-83-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
index 538c4e89986bf93f68945c9d7404673aafb12b5d..ff43330eea925fd9906007246e373ae16fedf975 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-84-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
index 22ae6477da219a7e87767d1b33afd2fb510fa10e..f88e6830533803929088ca9f602863214ec7ac9c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-85-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
index 3dd598291415925ca7e08cd8838455b87d0c667c..a1ace87eb4c79eea1fe8df88d88f6d1cd4d458ae 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-86-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
index cb90be1ad88904b095ed0f59fbb89ca83bee388c..98663b95277d280d5197dd0c3e12fe9291158d81 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-87-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
index 0e9f9d687d3b595182dd9cb60ce84cb2514bbbea..dac1ac0690cf7be682e7d9516026149d455ec193 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-88-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
index 12c28f818552324d977d387273958fdc9fa2a5c4..b77e1804dc9f2476b621dc4a4840c6a3e30028e1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-89-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
index ce119973f3a72be81b5b67ce17c747cf4d5c5202..4a206af3af106a6ed2760dc90422d97f5978f029 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-9-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
index d47eb5af16fdf35d5699178f9a0b3bb2cfba044a..da3ebc6ad8cba33d77d3dc090b372dd545be8223 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-90-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
index 30744473119536fca7eb4940fb7d9112454cbed0..7f33594419a94959060e3a887a61ccffbcec69a5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-91-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
index 5ef9fd5d6ac5e8ec224ad7a4c438203e2c09199b..d8e2bccda640eea870ba029d514e8cd758b7d903 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-92-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
index d1d8515428ab706e396835fc550483a92dc33936..c0d129672a2485ca27c1a4edb0fb207918c5ba5f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-93-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
index 62aa29bf168810ef61805904c0ed87a6465f9c27..e298ee5cda00964fe722a00377a15b14f3d2e583 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-94-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
index f3d8b6134f678be993530b52ba76d885e4c44edc..2382c3569a85f1583c138ce20da269e77012d2c9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-95-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
index 0eae389522cee0da187f3dfc5b11e40aa2f5089f..0d1b6cd83bb8e26f7207c860fadeec59df717b46 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-96-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
index 158a29502e290275b625af476a78cce2100d8154..3e3a82795e74cd23d52afe0a372170dbb4869461 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-97-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
index f9f8604ba97e7a42933ff20c7f2a7a0e14a7eb92..829b4330bf8ea9f30081e27408edc55d75346248 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-98-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
index cb8adf235b41dc821bfd5cfb973e95589cd8fa78..fdf9907d41e168b0a58e215e9ea9980d95d32ef9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-99-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/orsay.json b/data/grid5000/sites/orsay/orsay.json
index 8c1413ed6780043602b38972b5c3ff13dbb62591..200637b60b2683e443f4d438c20ebcdd050076ad 100755
--- a/data/grid5000/sites/orsay/orsay.json
+++ b/data/grid5000/sites/orsay/orsay.json
@@ -1,14 +1,4 @@
 {
-  "description": "",
-  "email_contact": null,
-  "latitude": 48.7,
-  "location": "Orsay, France",
-  "longitude": 2.2,
-  "name": "Orsay",
-  "security_contact": null,
-  "sys_admin_contact": null,
   "type": "site",
-  "uid": "orsay",
-  "user_support_contact": null,
-  "web": null
+  "uid": "orsay"
 }
\ No newline at end of file
diff --git a/generators/input/orsay-network.yaml b/generators/input/orsay-network.yaml
index 25f036f39996dc52b2cb7dbcf387e3d2c729dea1..3d3a1a7a598f6943a7c4a2eccb9623e6056faa97 100644
--- a/generators/input/orsay-network.yaml
+++ b/generators/input/orsay-network.yaml
@@ -1,243 +1,316 @@
 --- 
 switch-eth0-0:
   name: "switch11"
-  nodes: "gdx-[1,18]"
+  nodes: "gdx-[1-18]"
   rate: 1.G
   ip: 172.26.120.111
   mac: 00:12:01:73:21:C2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-1:
   name: "switch12"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[19-36]"
   rate: 1.G  
   ip: 172.26.120.112
   mac: 00:12:01:73:27:C2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-2:
   name: "switch09"
-  nodes: "gdx-[37,54]"
+  nodes: "gdx-[37-54]"
   rate: 1.G  
   ip: 172.26.120.109
   mac: 00:24:F9:3E:81:42
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-3:
   name: "switch08"
-  nodes: "gdx-[55,72]"
+  nodes: "gdx-[55-72]"
   rate: 1.G  
   ip: 172.26.120.108
   mac: 00:11:BB:3E:FD:C2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-4:
   name: "switch06"
-  nodes: "gdx-[73,90]"
+  nodes: "gdx-[73-90]"
   rate: 1.G  
   ip: 172.26.120.106
   mac: 00:24:f9:3e:e7:42
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-5:
   name: "switch05"
-  nodes: "gdx-[91,108]"
+  nodes: "gdx-[91-108]"
   rate: 1.G  
   ip: 172.26.120.105
   mac: 00:12:00:44:53:42
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-6:
   name: "switch03"
-  nodes: "gdx-[109,126]"
+  nodes: "gdx-[109-126]"
   rate: 1.G  
   ip: 172.26.120.103
   mac: 00:24:f9:3e:a7:42
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-7:
   name: "switch02"
-  nodes: "gdx-[127,144]"
+  nodes: "gdx-[127-144]"
   rate: 1.G  
   ip: 172.26.120.102
   mac: 00:12:00:4c:f5:c2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-8:
   name: "procurve17"
-  nodes: "gdx-[145,162]"
+  nodes: "gdx-[145-162]"
   rate: 100.M  
   ip: 172.26.120.197
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-9:
   name: "procurve18"
-  nodes: "gdx-[163,180]"
+  nodes: "gdx-[163-180]"
   rate: 100.M  
   ip: 172.26.120.198
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-10:
-  name: "switch15"
-  nodes: "gdx-[181,198]"
-  rate: 1.G  
-  ip: 172.26.120.115
-  mac: aa:aa:aa:aa:aa:aa
-switch-eth0-11:
   name: "switch14"
-  nodes: "gdx-[199,216]"
+  nodes: "gdx-[181-198]"
   rate: 1.G  
   ip: 172.26.120.114
   mac: 00:11:bb:17:e8:c2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-11:
+  name: "switch15"
+  nodes: "gdx-[199-216]"
+  rate: 1.G  
+  ip: 172.26.120.115
+  mac: 00:12:00:4c:a7:c2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-12:
-  name: "switch07"
-  nodes: "gdx-[217,234]"
+  name: "procurve-04-07"
+  nodes: "gdx-[217-234]"
   rate: 1.G  
   ip: 172.26.120.107
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-13:
-  name: "switch04"
-  nodes: "gdx-[235,252]"
+  name: "procurve-04-07"
+  nodes: "gdx-[235-252]"
   rate: 1.G  
   ip: 172.26.120.104
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-14:
   name: "switch10"
-  nodes: "gdx-[253,270]"
+  nodes: "gdx-[253-270]"
   rate: 1.G  
   ip: 172.26.120.110
   mac: 00:12:01:72:cd:42
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-15:
   name: "switch16"
-  nodes: "gdx-[271,288]"
+  nodes: "gdx-[271-288]"
   rate: 1.G  
   ip: 172.26.120.116
   mac: 00:12:01:5b:af:42
+  next_switch : "switch-gw"
+  next_switch_rate : 3.G
 switch-eth0-16:
-  name: "procurve01"
-  nodes: "gdx-[289,306]"
-  rate: 100.M  
-  ip: 172.26.120.181
-  mac: aa:aa:aa:aa:aa:aa
+  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 : 3.G
 switch-eth0-17:
   name: "switch13"
-  nodes: "gdx-[307,310]"
+  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-bmc-0:
   name: "netgear01"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[1-36]"
   rate: 1.G  
   ip: 172.26.120.151
   mac: 00:0f:b5:fc:0d:26
+  next_switch : "switch-eth0-1"
+  next_switch_rate : 1.G
 switch-bmc-1:
   name: "netgear02"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[37-72]"
   rate: 1.G  
   ip: 172.26.120.152
   mac: 00:22:3f:e6:f8:ce
+  next_switch : "switch-eth0-3"
+  next_switch_rate : 1.G
 switch-bmc-2:
   name: "netgear03"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[73-108]"
   rate: 1.G  
   ip: 172.26.120.153
   mac: 00:0f:b5:fb:70:89
+  next_switch : "switch-eth0-5"
+  next_switch_rate : 1.G
 switch-bmc-3:
   name: "netgear04"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[109-144]"
   rate: 1.G  
   ip: 172.26.120.154
   mac: 00:0f:b5:f5:79:2a
+  next_switch : "switch-eth0-7"
+  next_switch_rate : 1.G
 switch-bmc-4:
   name: "netgear05"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[145-180]"
   rate: 1.G  
   ip: 172.26.120.155
   mac: 00:0f:b5:fb:70:a5
+  next_switch : "switch-eth0-9"
+  next_switch_rate : 1.G
 switch-bmc-5:
   name: "netgear06"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[181-216]"
   rate: 1.G  
   ip: 172.26.120.156
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-eth0-11"
+  next_switch_rate : 1.G
 switch-bmc-6:
   name: "netgear07"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[216-252]"
   rate: 1.G  
   ip: 172.26.120.157
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-eth0-13"
+  next_switch_rate : 1.G
 switch-bmc-7:
   name: "netgear08"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[253-288]"
   rate: 1.G  
   ip: 172.26.120.158
   mac: 00:0f:b5:fc:0d:aa
+  next_switch : "switch-eth0-15"
+  next_switch_rate : 1.G
 switch-bmc-8:
   name: "procurve-bmc-09"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[289-310]"
   rate: 100.M  
   ip: 172.26.120.159
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-eth0-17"
+  next_switch_rate : 1.G
 switch-bmc-netgdx:
   name: "netgearxy"
-  nodes: "netgdx-[1,30]"
+  nodes: "netgdx-[1-30]"
   rate: 1.G  
   ip: 172.26.120.150
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 1.G
 switch-rsa-0:
   name: "mrv01"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[1-36]"
   rate: 1.G  
   ip: 172.26.120.201
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-eth0-1"
+  next_switch_rate : 1.G
 switch-rsa-1:
   name: "mrv02"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[37-72]"
   rate: 1.G  
   ip: 172.26.120.202
   mac: 00:a0:9c:00:16:41
+  next_switch : "switch-eth0-3"
+  next_switch_rate : 1.G
 switch-rsa-2:
   name: "mrv03"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[73-108]"
   rate: 1.G  
   ip: 172.26.120.203
   mac: 00:a0:9c:00:12:dd
+  next_switch : "switch-eth0-5"
+  next_switch_rate : 1.G
 switch-rsa-3:
   name: "mrv04"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[109-144]"
   rate: 1.G  
   ip: 172.26.120.204
   mac: 00:a0:9c:00:12:e4
+  next_switch : "switch-eth0-7"
+  next_switch_rate : 1.G
 switch-rsa-4:
   name: "mrv05"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[145-180]"
   rate: 1.G  
   ip: 172.26.120.205
   mac: 00:a0:9c:00:10:ae
+  next_switch : "switch-eth0-9"
+  next_switch_rate : 1.G
 switch-rsa-5:
   name: "mrv06"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[181-216]"
   rate: 1.G  
   ip: 172.26.120.206
   mac: 00:a0:9c:00:16:42
+  next_switch : "switch-eth0-11"
+  next_switch_rate : 1.G
 switch-rsa-6:
   name: "mrv07"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[217-252]"
   rate: 1.G  
   ip: 172.26.120.207
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-eth0-13"
+  next_switch_rate : 1.G
 switch-rsa-7:
   name: "mrv08"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[253-288]"
   rate: 1.G  
   ip: 172.26.120.208
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-eth0-15"
+  next_switch_rate : 1.G
 switch-rsa-8:
   name: "mrv09"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[289-310]"
   rate: 1.G  
   ip: 172.26.120.209
   mac: 00:a0:9c:00:25:4a
+  next_switch : "switch-eth0-17"
+  next_switch_rate : 1.G
 switch-rsa-netgdx:
   name: "mrv00"
-  nodes: "netgdx-[1,30]"
+  nodes: "netgdx-[1-30]"
   rate: 1.G 
   ip: 172.26.120.200
-  mac: aa:aa:aa:aa:aa:aa
-  
+  mac: nil
 switch-mx:
   name: "switch-mx"
-  nodes: "gdx-[1,310]"
+  nodes: "gdx-[1-310]"
   rate: 10.G  
-  ip: 1.1.1.1
-  mac: aa:aa:aa:aa:aa:aa
+  ip: nil
+  mac: nil
 switch-gw:
   name-prod: "gw"
   name-admin: "cisco"
-  nodes: "netgdx-[1,30]"
+  nodes: "netgdx-[1-30]"
   rate: 1.G 
   ip-prod: 172.24.120.10
   mac-prod: 00:11:5d:3d:50:00