From afbfe226b3b92dac3ce86df92e3b43e353018f0c Mon Sep 17 00:00:00 2001
From: Elodie Bertoncello <elodie.bertoncello@inria.fr>
Date: Wed, 24 Oct 2012 10:47:01 +0200
Subject: [PATCH] [Grenoble] change edel-16 MAC address, regenerate json
 without -eth0 (bug in edel.rb file)

---
 .../sites/grenoble/clusters/adonis/nodes/adonis-1.json      | 2 +-
 .../sites/grenoble/clusters/adonis/nodes/adonis-10.json     | 2 +-
 .../sites/grenoble/clusters/adonis/nodes/adonis-2.json      | 2 +-
 .../sites/grenoble/clusters/adonis/nodes/adonis-3.json      | 2 +-
 .../sites/grenoble/clusters/adonis/nodes/adonis-4.json      | 2 +-
 .../sites/grenoble/clusters/adonis/nodes/adonis-5.json      | 2 +-
 .../sites/grenoble/clusters/adonis/nodes/adonis-6.json      | 2 +-
 .../sites/grenoble/clusters/adonis/nodes/adonis-7.json      | 2 +-
 .../sites/grenoble/clusters/adonis/nodes/adonis-8.json      | 2 +-
 .../sites/grenoble/clusters/adonis/nodes/adonis-9.json      | 2 +-
 .../grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-10.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-11.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-12.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-13.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-14.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-15.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-16.json         | 6 +++---
 .../sites/grenoble/clusters/edel/nodes/edel-17.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-18.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-19.json         | 2 +-
 .../grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-20.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-21.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-22.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-23.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-24.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-25.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-26.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-27.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-28.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-29.json         | 2 +-
 .../grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-30.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-31.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-32.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-33.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-34.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-35.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-36.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-37.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-38.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-39.json         | 2 +-
 .../grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-40.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-41.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-42.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-43.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-44.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-45.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-46.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-47.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-48.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-49.json         | 2 +-
 .../grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-50.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-51.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-52.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-53.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-54.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-55.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-56.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-57.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-58.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-59.json         | 2 +-
 .../grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-60.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-61.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-62.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-63.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-64.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-65.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-66.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-67.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-68.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-69.json         | 2 +-
 .../grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-70.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-71.json         | 2 +-
 .../sites/grenoble/clusters/edel/nodes/edel-72.json         | 2 +-
 .../grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json | 2 +-
 .../grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json | 2 +-
 generators/input/sites/grenoble/clusters/edel.yaml          | 4 ++--
 83 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
index 1f8996b6170..af567cdc604 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
@@ -51,7 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-1-eth0.grenoble.grid5000.fr",
+      "network_address": "adonis-1.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
       "switch_port": "Gi3/11",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
index 0a92821c8a6..7579b937197 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
@@ -51,7 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-10-eth0.grenoble.grid5000.fr",
+      "network_address": "adonis-10.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
       "switch_port": "Gi3/20",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
index 3a47403b45f..8ff8ab977fc 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
@@ -51,7 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-2-eth0.grenoble.grid5000.fr",
+      "network_address": "adonis-2.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
       "switch_port": "Gi3/12",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
index aa2bc9c4992..37b61d3ddb7 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
@@ -51,7 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-3-eth0.grenoble.grid5000.fr",
+      "network_address": "adonis-3.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
       "switch_port": "Gi3/13",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
index 9ab6636059d..0023f8dce02 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -51,7 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-4-eth0.grenoble.grid5000.fr",
+      "network_address": "adonis-4.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
       "switch_port": "Gi3/14",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
index 0b9648b853b..ac440b19698 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
@@ -51,7 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-5-eth0.grenoble.grid5000.fr",
+      "network_address": "adonis-5.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
       "switch_port": "Gi3/15",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
index 0973d278602..af89d880c0d 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
@@ -51,7 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-6-eth0.grenoble.grid5000.fr",
+      "network_address": "adonis-6.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
       "switch_port": "Gi3/16",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
index fe743ab5b9d..5bb4b56c626 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
@@ -51,7 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-7-eth0.grenoble.grid5000.fr",
+      "network_address": "adonis-7.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
       "switch_port": "Gi3/17",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
index df403843ef7..1d2466c12e9 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
@@ -51,7 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-8-eth0.grenoble.grid5000.fr",
+      "network_address": "adonis-8.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
       "switch_port": "Gi3/18",
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
index 6fa119acb24..04688e54936 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
@@ -51,7 +51,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-9-eth0.grenoble.grid5000.fr",
+      "network_address": "adonis-9.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw",
       "switch_port": "Gi3/19",
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
index 5657045adea..4b7cbd478bc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-1-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-1.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
index 9a03b32917a..2a192ed9528 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-10-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-10.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
index f1949fa948c..fe34c6cbafc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-11-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-11.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
index 46e07473dd4..158c96caa59 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-12-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-12.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
index b3e3188ec1c..828d00f034d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-13-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-13.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
index 36395323dec..d93a0a4d890 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-14-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-14.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
index 293f476040a..3b2983578b1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-15-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-15.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
index 430319b6332..a225a091b15 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
@@ -56,11 +56,11 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.66",
-      "mac": "08:00:38:35:ac:0c",
+      "mac": "08:00:38:36:f3:2c",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-16-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-16.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
@@ -83,7 +83,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.66",
-      "mac": "08:00:38:35:a3:fe",
+      "mac": "08:00:38:36:af:96",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
index 48c87bb90c1..e14239a7c2d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-17-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-17.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
index c2634f45ae7..76654d3e818 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-18-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-18.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
index 467f71f3aa2..21e29f45de9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-19-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-19.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
index d0e7f4ff1f9..6f716d146b3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-2-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-2.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
index fd24b8f0d42..28e0318dabd 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-20-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-20.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
index 387b43f0643..2cd1a69624a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-21-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-21.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
index b58f9d327a1..ced34d62f50 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-22-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-22.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
index 76a3828a9dd..0d4053c47c8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-23-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-23.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
index bd7aaab09e8..b14064cfd89 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-24-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-24.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
index c713d234eb9..3ea5917e845 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-25-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-25.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
index 33e3bfe3012..69d9e6a611f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-26-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-26.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
index 7a13903620e..edfbc9739d4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-27-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-27.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
index a31061a39f6..9a3976d9951 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-28-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-28.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
index 20ed04a78db..14b5810620f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-29-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-29.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
index f5d1eb3bfc7..c098282b2e0 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-3-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-3.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
index 6e145e31847..e5f0b9d85f1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-30-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-30.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
index 3a45e9a3c90..29e5cc3a579 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-31-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-31.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
index 3ff6559b51e..a62d02b658e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-32-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-32.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
index 35b0b170a70..170cc293b15 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-33-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-33.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
index d53ee18f498..c1a83274d19 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-34-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-34.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
index f620eef87e9..e8464097f1c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-35-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-35.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
index c780c2a6590..701cf60ff27 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-36-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-36.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-2",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
index 7b0843bc342..34b94c61e82 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-37-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-37.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "blade-",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
index 5b6237816a3..85de9967d19 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-38-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-38.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "blade-",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
index 5f88a9179aa..37a32a32fc8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-39-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-39.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
index dd9c03ff2c2..2c5f8b91044 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-4-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-4.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
index ad33a9140bb..a723442388c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-40-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-40.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
index 5140b6513e9..4af68f0cf1d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-41-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-41.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
index ee8eda11048..7d6c6ec2f89 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-42-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-42.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
index 49c83e3e4cd..0ed87e55b16 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-43-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-43.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
index 57d171eb6f1..ec26e34c047 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-44-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-44.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
index e67cf016af0..5fa886b06ec 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-45-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-45.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
index 482f09b0269..626735bfc8e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-46-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-46.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
index 410f8668a41..48c78944efe 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-47-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-47.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
index 3785acc0883..4a0df92ccb1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-48-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-48.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
index 806e77968f0..2e66b9f31f3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-49-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-49.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
index 3cfc3f64cd7..c03b5c479a9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-5-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-5.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
index 3efc249f9b8..03589822e19 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-50-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-50.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
index 90b506480f9..9e511ef1ea2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-51-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-51.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
index 1d9bc360ff1..0818e8bfe6c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-52-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-52.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
index 28dab081b7f..b07ab8890b7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-53-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-53.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
index 714689b7c74..427f1ae0f58 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-54-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-54.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-3",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
index 25118058310..3d7a5dcd6eb 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-55-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-55.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
index 404a9d42297..de885f74c63 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-56-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-56.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
index bbc89c00a98..e491af00543 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-57-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-57.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
index c935a1cd396..ad5b00261c1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-58-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-58.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
index 9f9ca658be4..44ccd071946 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-59-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-59.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
index 1d075128607..18b91a13a0c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-6-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-6.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
index 6bb5bb20466..643a62f4378 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-60-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-60.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
index a84a6dedfc3..4a8928179aa 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-61-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-61.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
index d9150f2fc26..f65d1bd0682 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-62-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-62.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
index b2d537d5ffd..ae2cdd390f6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-63-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-63.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
index 477f76ba636..eab711d8bf2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-64-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-64.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
index a5f8fb16afe..330325cdcfc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-65-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-65.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
index f6676ba28c9..7d91d71603a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-66-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-66.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
index 3f8e1a4757b..9b5cc718778 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-67-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-67.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
index 449ea2a2f75..8832841c942 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-68-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-68.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
index 67511bc8a95..53d2896a4df 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-69-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-69.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
index e345cc88678..9554a996890 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-7-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-7.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
index 94318981ab8..daab2730707 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-70-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-70.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
index 6fd95722a8a..5e6bd8b4b81 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-71-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-71.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
index ca783f93e06..618637b0d6e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-72-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-72.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-4",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
index 6046b32a50d..8732c4799e6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-8-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-8.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
index 3ae2b217081..caeb0fa5eda 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
@@ -60,7 +60,7 @@
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-9-eth0.grenoble.grid5000.fr",
+      "network_address": "edel-9.grenoble.grid5000.fr",
       "rate": 1000000000,
       "switch": "edel-sw-1",
       "switch_port": null,
diff --git a/generators/input/sites/grenoble/clusters/edel.yaml b/generators/input/sites/grenoble/clusters/edel.yaml
index c04fa9d9889..24d95b749d2 100644
--- a/generators/input/sites/grenoble/clusters/edel.yaml
+++ b/generators/input/sites/grenoble/clusters/edel.yaml
@@ -484,7 +484,7 @@ edel-16:
     ib1:
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00
     eth0:
-      mac: 08:00:38:35:ac:0c
+      mac: 08:00:38:36:f3:2c
       ip: 172.16.16.66
       switch_name: edel-sw-1
       switch_port: 
@@ -492,7 +492,7 @@ edel-16:
       mac: 08:00:38:35:ac:0d
       ip: 
     bmc:
-      mac: 08:00:38:35:a3:fe
+      mac: 08:00:38:36:af:96
       ip: 192.168.2.66
 edel-17:
   bios:
-- 
GitLab