From e47ac120d3414c8c4f4d4a16e46e30f36d608ee8 Mon Sep 17 00:00:00 2001
From: Philippe Robert <Philippe-Charles.Robert@loria.fr>
Date: Tue, 5 Oct 2010 11:53:50 +0200
Subject: [PATCH] [grenoble] typo correction grenoble.yaml - new grenoble.rb -
 new json files generated

---
 .../clusters/adonis/nodes/adonis-1.json       |  3 ++
 .../clusters/adonis/nodes/adonis-10.json      |  3 ++
 .../clusters/adonis/nodes/adonis-11.json      |  1 +
 .../clusters/adonis/nodes/adonis-12.json      |  1 +
 .../clusters/adonis/nodes/adonis-2.json       |  3 ++
 .../clusters/adonis/nodes/adonis-3.json       |  3 ++
 .../clusters/adonis/nodes/adonis-4.json       |  3 ++
 .../clusters/adonis/nodes/adonis-5.json       |  3 ++
 .../clusters/adonis/nodes/adonis-6.json       |  3 ++
 .../clusters/adonis/nodes/adonis-7.json       |  3 ++
 .../clusters/adonis/nodes/adonis-8.json       |  3 ++
 .../clusters/adonis/nodes/adonis-9.json       |  3 ++
 .../grenoble/clusters/edel/nodes/edel-1.json  |  2 ++
 .../grenoble/clusters/edel/nodes/edel-10.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-11.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-12.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-13.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-14.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-15.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-16.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-17.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-18.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-19.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-2.json  |  2 ++
 .../grenoble/clusters/edel/nodes/edel-20.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-21.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-22.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-23.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-24.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-25.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-26.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-27.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-28.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-29.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-3.json  |  2 ++
 .../grenoble/clusters/edel/nodes/edel-30.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-31.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-32.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-33.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-34.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-35.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-36.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-37.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-38.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-39.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-4.json  |  2 ++
 .../grenoble/clusters/edel/nodes/edel-40.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-41.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-42.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-43.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-44.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-45.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-46.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-47.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-48.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-49.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-5.json  |  2 ++
 .../grenoble/clusters/edel/nodes/edel-50.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-51.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-52.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-53.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-54.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-55.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-56.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-57.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-58.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-59.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-6.json  |  2 ++
 .../grenoble/clusters/edel/nodes/edel-60.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-61.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-62.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-63.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-64.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-65.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-66.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-67.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-68.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-69.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-7.json  |  2 ++
 .../grenoble/clusters/edel/nodes/edel-70.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-71.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-72.json |  2 ++
 .../grenoble/clusters/edel/nodes/edel-8.json  |  2 ++
 .../grenoble/clusters/edel/nodes/edel-9.json  |  2 ++
 .../clusters/genepi/nodes/genepi-1.json       |  3 ++
 .../clusters/genepi/nodes/genepi-10.json      |  3 ++
 .../clusters/genepi/nodes/genepi-11.json      |  3 ++
 .../clusters/genepi/nodes/genepi-12.json      |  3 ++
 .../clusters/genepi/nodes/genepi-13.json      |  3 ++
 .../clusters/genepi/nodes/genepi-14.json      |  3 ++
 .../clusters/genepi/nodes/genepi-15.json      |  3 ++
 .../clusters/genepi/nodes/genepi-16.json      |  3 ++
 .../clusters/genepi/nodes/genepi-17.json      |  3 ++
 .../clusters/genepi/nodes/genepi-18.json      |  3 ++
 .../clusters/genepi/nodes/genepi-19.json      |  3 ++
 .../clusters/genepi/nodes/genepi-2.json       |  3 ++
 .../clusters/genepi/nodes/genepi-20.json      |  3 ++
 .../clusters/genepi/nodes/genepi-21.json      |  3 ++
 .../clusters/genepi/nodes/genepi-22.json      |  3 ++
 .../clusters/genepi/nodes/genepi-23.json      |  3 ++
 .../clusters/genepi/nodes/genepi-24.json      |  3 ++
 .../clusters/genepi/nodes/genepi-25.json      |  3 ++
 .../clusters/genepi/nodes/genepi-26.json      |  3 ++
 .../clusters/genepi/nodes/genepi-27.json      |  3 ++
 .../clusters/genepi/nodes/genepi-28.json      |  3 ++
 .../clusters/genepi/nodes/genepi-29.json      |  3 ++
 .../clusters/genepi/nodes/genepi-3.json       |  3 ++
 .../clusters/genepi/nodes/genepi-30.json      |  3 ++
 .../clusters/genepi/nodes/genepi-31.json      |  3 ++
 .../clusters/genepi/nodes/genepi-32.json      |  3 ++
 .../clusters/genepi/nodes/genepi-33.json      |  3 ++
 .../clusters/genepi/nodes/genepi-34.json      |  3 ++
 .../clusters/genepi/nodes/genepi-4.json       |  3 ++
 .../clusters/genepi/nodes/genepi-5.json       |  3 ++
 .../clusters/genepi/nodes/genepi-6.json       |  3 ++
 .../clusters/genepi/nodes/genepi-7.json       |  3 ++
 .../clusters/genepi/nodes/genepi-8.json       |  3 ++
 .../clusters/genepi/nodes/genepi-9.json       |  3 ++
 generators/input/grenoble.rb                  | 29 ++++++++++++-------
 generators/input/grenoble.yaml                |  5 ++--
 120 files changed, 300 insertions(+), 12 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 f27a3b036e1..aa9a16f3079 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.131",
+      "mac": "00:30:48:cc:7f:d8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -39,6 +40,7 @@
       "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cc:7f:d9",
       "management": false,
       "mountable": false,
       "mounted": false,
@@ -48,6 +50,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.131",
+      "mac": "00:30:48:cc:b0:58",
       "management": true,
       "mountable": false,
       "mounted": false,
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 3f4ce0e9cb6..c576ef37b2d 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.140",
+      "mac": "00:30:48:cc:83:10",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -39,6 +40,7 @@
       "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cc:83:11",
       "management": false,
       "mountable": false,
       "mounted": false,
@@ -48,6 +50,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.140",
+      "mac": "00:30:48:cc:ad:df",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
index 263e99fcc7c..0a025c3d7d8 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.141",
+      "mac": "00:30:48:da:6f:66",
       "management": false,
       "mountable": true,
       "mounted": true,
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
index 3f410a15fe1..7fbfececda1 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.142",
+      "mac": "00:25:90:01:eb:fc",
       "management": false,
       "mountable": true,
       "mounted": true,
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 e4667792939..076f08034e3 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.132",
+      "mac": "00:30:48:cc:7f:da",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -39,6 +40,7 @@
       "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cc:7f:db",
       "management": false,
       "mountable": false,
       "mounted": false,
@@ -48,6 +50,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.132",
+      "mac": "00:30:48:cc:b0:59",
       "management": true,
       "mountable": false,
       "mounted": false,
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 a4f212fd313..d155c812193 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.133",
+      "mac": "00:30:48:cd:c6:a4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -39,6 +40,7 @@
       "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cd:c6:a5",
       "management": false,
       "mountable": false,
       "mounted": false,
@@ -48,6 +50,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.133",
+      "mac": "00:30:48:cc:b5:f6",
       "management": true,
       "mountable": false,
       "mounted": false,
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 db2a807b756..a6d6a181b3b 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.134",
+      "mac": "00:30:48:cd:c0:ac",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -39,6 +40,7 @@
       "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cd:c0:ad",
       "management": false,
       "mountable": false,
       "mounted": false,
@@ -48,6 +50,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.134",
+      "mac": "00:30:48:cc:b6:6c",
       "management": true,
       "mountable": false,
       "mounted": false,
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 8923ccf15f8..59b3fe0d0b3 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.135",
+      "mac": "00:30:48:cc:7e:0a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -39,6 +40,7 @@
       "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cc:7e:0b",
       "management": false,
       "mountable": false,
       "mounted": false,
@@ -48,6 +50,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.135",
+      "mac": "00:30:48:cc:af:61",
       "management": true,
       "mountable": false,
       "mounted": false,
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 ee1e70562e9..800015c7f56 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.136",
+      "mac": "00:30:48:cc:7a:bc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -39,6 +40,7 @@
       "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cc:7a:bd",
       "management": false,
       "mountable": false,
       "mounted": false,
@@ -48,6 +50,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.136",
+      "mac": "00:30:48:cc:ad:f2",
       "management": true,
       "mountable": false,
       "mounted": false,
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 d2397142b6b..b4d40a4946b 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.137",
+      "mac": "00:30:48:cd:c6:80",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -39,6 +40,7 @@
       "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cd:c6:81",
       "management": false,
       "mountable": false,
       "mounted": false,
@@ -48,6 +50,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.137",
+      "mac": "00:30:48:cc:b5:e4",
       "management": true,
       "mountable": false,
       "mounted": false,
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 4f45f8ec101..8a2d1c62979 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.138",
+      "mac": "00:30:48:cd:c0:ae",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -39,6 +40,7 @@
       "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cd:c0:af",
       "management": false,
       "mountable": false,
       "mounted": false,
@@ -48,6 +50,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.138",
+      "mac": "00:30:48:cc:b6:6d",
       "management": true,
       "mountable": false,
       "mounted": false,
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 7bb2ed00f27..577993bb2c9 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.139",
+      "mac": "00:30:48:cb:cf:7e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -39,6 +40,7 @@
       "device": "eth1",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:cb:cf:7f",
       "management": false,
       "mountable": false,
       "mounted": false,
@@ -48,6 +50,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.139",
+      "mac": "00:30:48:cc:ac:d1",
       "management": true,
       "mountable": false,
       "mounted": false,
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 8ed0613c86f..26834b3c732 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.51",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.51",
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
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 29300f182fe..daef7d6b94e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.60",
+      "mac": "08:00:38:35:ab:94",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.60",
+      "mac": "",
       "management": true,
       "mountable": false,
       "mounted": false,
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 8ed8f284565..276b88f3704 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.61",
+      "mac": "08:00:38:35:ab:90",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.61",
+      "mac": "",
       "management": true,
       "mountable": false,
       "mounted": false,
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 5cf510ee725..e29b1163d2c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.62",
+      "mac": "08:00:38:35:ac:3c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.62",
+      "mac": "08:00:38:35:a4:1e",
       "management": true,
       "mountable": false,
       "mounted": false,
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 c7c96302996..64bbb8db4cb 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.63",
+      "mac": "08:00:38:35:ab:dc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.63",
+      "mac": "08:00:38:35:a3:ee",
       "management": true,
       "mountable": false,
       "mounted": false,
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 7a77f5fc000..b11a097327d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.64",
+      "mac": "08:00:38:35:ab:ac",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.64",
+      "mac": "08:00:38:35:a3:d6",
       "management": true,
       "mountable": false,
       "mounted": false,
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 3a660fcaa46..a7ff339b756 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.65",
+      "mac": "08:00:38:35:ab:fc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.65",
+      "mac": "08:00:38:35:a3:fe",
       "management": true,
       "mountable": false,
       "mounted": false,
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 033642fb10a..7b8e95d6f26 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.66",
+      "mac": "08:00:38:35:ac:0c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.66",
+      "mac": "08:00:38:35:a4:06",
       "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 e827403a44b..d399b58cfa5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.67",
+      "mac": "08:00:38:35:ab:9e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.67",
+      "mac": "08:00:38:35:a3:cf",
       "management": true,
       "mountable": false,
       "mounted": false,
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 1fba0a26f9b..dc89b34a1a4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.68",
+      "mac": "08:00:38:35:ab:82",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.68",
+      "mac": "08:00:38:35:a3:c1",
       "management": true,
       "mountable": false,
       "mounted": false,
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 c80c73e7f93..709f17728cd 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.69",
+      "mac": "08:00:38:35:ab:d0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.69",
+      "mac": "08:00:38:35:a3:e8",
       "management": true,
       "mountable": false,
       "mounted": false,
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 595425fd711..9c725f53c12 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.52",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.52",
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
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 3125024eb70..abd3ddc45bf 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.70",
+      "mac": "08:00:38:35:ab:78",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.70",
+      "mac": "08:00:38:35:a3:bc",
       "management": true,
       "mountable": false,
       "mounted": false,
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 54d51ed3bd2..2c0354ea9c6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.71",
+      "mac": "08:00:38:35:ac:4a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.71",
+      "mac": "08:00:38:35:a4:25",
       "management": true,
       "mountable": false,
       "mounted": false,
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 d848d46b2c5..e1f36b6398a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.72",
+      "mac": "08:00:38:35:ab:9c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.72",
+      "mac": "08:00:38:35:a3:ce",
       "management": true,
       "mountable": false,
       "mounted": false,
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 e861cc45fdd..35dced59b4a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.73",
+      "mac": "08:00:38:35:ab:d6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.73",
+      "mac": "08:00:38:35:a3:eb",
       "management": true,
       "mountable": false,
       "mounted": false,
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 f70cc87e8d1..ce3d1034768 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.74",
+      "mac": "08:00:38:35:ac:26",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.74",
+      "mac": "",
       "management": true,
       "mountable": false,
       "mounted": false,
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 33402fa33a0..42ed22abb9e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.75",
+      "mac": "08:00:38:35:aa:b8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.75",
+      "mac": "08:00:38:35:a3:5c",
       "management": true,
       "mountable": false,
       "mounted": false,
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 e7d4ba3be68..98602f5e7d8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.76",
+      "mac": "08:00:38:35:ab:54",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.76",
+      "mac": "",
       "management": true,
       "mountable": false,
       "mounted": false,
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 4153abbf075..2cc7ad529b5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.77",
+      "mac": "08:00:38:35:ac:3e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.77",
+      "mac": "08:00:38:35:a4:1f",
       "management": true,
       "mountable": false,
       "mounted": false,
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 369b3f20a10..eb0b63b61d4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.78",
+      "mac": "08:00:38:35:ac:48",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.78",
+      "mac": "08:00:38:35:a4:24",
       "management": true,
       "mountable": false,
       "mounted": false,
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 6c72714a616..8aefddf9e22 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.79",
+      "mac": "08:00:38:35:ab:be",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.79",
+      "mac": "08:00:38:35:a3:df",
       "management": true,
       "mountable": false,
       "mounted": false,
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 28cc13a6fde..c40c095ac4f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.53",
+      "mac": "08:00:38:35:ab:8c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.53",
+      "mac": "08:00:38:35:a3:c6",
       "management": true,
       "mountable": false,
       "mounted": false,
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 bc6bb2913a3..e201f6d001e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.80",
+      "mac": "08:00:38:35:ab:ba",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.80",
+      "mac": "08:00:38:35:a3:dd",
       "management": true,
       "mountable": false,
       "mounted": false,
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 24b1421be48..b9c26a699f4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.81",
+      "mac": "08:00:38:35:af:3e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.81",
+      "mac": "08:00:38:35:a5:9f",
       "management": true,
       "mountable": false,
       "mounted": false,
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 70d516ecce6..40eabba413f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.82",
+      "mac": "08:00:38:35:ab:46",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.82",
+      "mac": "08:00:38:35:a3:a3",
       "management": true,
       "mountable": false,
       "mounted": false,
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 956ec28d54d..ae7e64ccdea 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.83",
+      "mac": "08:00:38:35:ac:4c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.83",
+      "mac": "08:00:38:35:a4:26",
       "management": true,
       "mountable": false,
       "mounted": false,
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 62eb36c0999..cea9027e1bc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.84",
+      "mac": "08:00:38:35:ab:a2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.84",
+      "mac": "08:00:38:35:a3:d1",
       "management": true,
       "mountable": false,
       "mounted": false,
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 e4f6ac71ead..a908fa298e3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.85",
+      "mac": "08:00:38:35:ab:62",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.85",
+      "mac": "08:00:38:35:a3:b1",
       "management": true,
       "mountable": false,
       "mounted": false,
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 79bd912db89..3166141e7dc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.86",
+      "mac": "08:00:38:35:ab:e6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.86",
+      "mac": "08:00:38:35:a3:f3",
       "management": true,
       "mountable": false,
       "mounted": false,
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 8e0383d8cc4..80e05eaa60e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.87",
+      "mac": "08:00:38:35:aa:64",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.87",
+      "mac": "08:00:38:35:a3:32",
       "management": true,
       "mountable": false,
       "mounted": false,
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 fb8f08dd58d..0475ed15698 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.88",
+      "mac": "08:00:38:35:ab:d2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.88",
+      "mac": "08:00:38:35:a3:e9",
       "management": true,
       "mountable": false,
       "mounted": false,
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 32a22ebb8dc..7823a47c239 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.89",
+      "mac": "08:00:38:35:ac:2a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.89",
+      "mac": "08:00:38:35:a4:15",
       "management": true,
       "mountable": false,
       "mounted": false,
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 602d3a7a0ce..707c3546031 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.54",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.54",
+      "mac": null,
       "management": true,
       "mountable": false,
       "mounted": false,
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 b444d1977c4..0ddc1a0f3ae 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.90",
+      "mac": "08:00:38:35:ab:a8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.90",
+      "mac": "08:00:38:35:a3:d4",
       "management": true,
       "mountable": false,
       "mounted": false,
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 7d7689e0acb..4ec15aa3d69 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.91",
+      "mac": "08:00:38:35:ac:36",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.91",
+      "mac": "08:00:38:35:a4:1b",
       "management": true,
       "mountable": false,
       "mounted": false,
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 48622986357..51954a9a7bf 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.92",
+      "mac": "08:00:38:35:ad:be",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.92",
+      "mac": "",
       "management": true,
       "mountable": false,
       "mounted": false,
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 4260e14a9fe..d89da517297 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.93",
+      "mac": "08:00:38:35:ab:d4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.93",
+      "mac": "08:00:38:35:a3:ea",
       "management": true,
       "mountable": false,
       "mounted": false,
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 7e24ad8fa63..1e99238de24 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.94",
+      "mac": "08:00:38:35:ab:aa",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.94",
+      "mac": "08:00:38:35:a3:d5",
       "management": true,
       "mountable": false,
       "mounted": false,
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 3b82eec1854..4b8da8a5161 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.95",
+      "mac": "08:00:38:35:ac:22",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.95",
+      "mac": "08:00:38:35:a4:11",
       "management": true,
       "mountable": false,
       "mounted": false,
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 5a3697a4105..0075934464c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.96",
+      "mac": "08:00:38:35:ab:4a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.96",
+      "mac": "08:00:38:35:a3:a5",
       "management": true,
       "mountable": false,
       "mounted": false,
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 36020172066..6d35cdfa574 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.97",
+      "mac": "08:00:38:35:ab:bc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.97",
+      "mac": "08:00:38:35:a3:de",
       "management": true,
       "mountable": false,
       "mounted": false,
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 1169d4536e4..bf8b1f539a8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.98",
+      "mac": "08:00:38:35:ab:70",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.98",
+      "mac": "08:00:38:35:a3:b8",
       "management": true,
       "mountable": false,
       "mounted": false,
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 adf57f6031f..601c3d48440 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.99",
+      "mac": "08:00:38:35:ab:b6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.99",
+      "mac": "08:00:38:35:a3:db",
       "management": true,
       "mountable": false,
       "mounted": false,
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 b9e887032b0..44b337d464c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.55",
+      "mac": "08:00:38:35:ab:92",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.55",
+      "mac": "08:00:38:35:a3:c9",
       "management": true,
       "mountable": false,
       "mounted": false,
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 d6defe9e6b4..f8f4faea089 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.100",
+      "mac": "08:00:38:35:ac:10",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.100",
+      "mac": "",
       "management": true,
       "mountable": false,
       "mounted": false,
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 af94611ed19..8809ba78c48 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.101",
+      "mac": "08:00:38:35:ac:40",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.101",
+      "mac": "08:00:38:35:a4:20",
       "management": true,
       "mountable": false,
       "mounted": false,
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 27a6e846c6a..80869a0cdf9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.102",
+      "mac": "08:00:38:35:ac:1a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.102",
+      "mac": "08:00:38:35:a4:0d",
       "management": true,
       "mountable": false,
       "mounted": false,
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 603c5c5c0d3..1139f195130 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.103",
+      "mac": "08:00:38:35:ac:34",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.103",
+      "mac": "08:00:38:35:a4:1a",
       "management": true,
       "mountable": false,
       "mounted": false,
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 e4548d00071..664d35feec2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.104",
+      "mac": "08:00:38:35:ac:3a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.104",
+      "mac": "08:00:38:35:a4:1d",
       "management": true,
       "mountable": false,
       "mounted": false,
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 caa8259548d..7f5b6fdfaed 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.105",
+      "mac": "08:00:38:35:ab:e8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.105",
+      "mac": "08:00:38:35:a3:f4",
       "management": true,
       "mountable": false,
       "mounted": false,
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 da6f7b73dcb..119416e9850 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.106",
+      "mac": "08:00:38:35:ac:00",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.106",
+      "mac": "08:00:38:35:a4:00",
       "management": true,
       "mountable": false,
       "mounted": false,
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 94f989e14d5..df263cf9c50 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.107",
+      "mac": "08:00:38:35:ab:ae",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.107",
+      "mac": "08:00:38:35:a3:d7",
       "management": true,
       "mountable": false,
       "mounted": false,
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 22340440ea2..c594cdbf168 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.108",
+      "mac": "08:00:38:35:ac:08",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.108",
+      "mac": "08:00:38:35:a4:04",
       "management": true,
       "mountable": false,
       "mounted": false,
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 30aac6d91fe..d8cd608c561 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.109",
+      "mac": "08:00:38:35:ab:5a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.109",
+      "mac": "08:00:38:35:a3:ad",
       "management": true,
       "mountable": false,
       "mounted": false,
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 92ab4ea1a2e..030cc97cddb 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.56",
+      "mac": "08:00:38:35:ac:54",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.56",
+      "mac": "08:00:38:35:a4:2a",
       "management": true,
       "mountable": false,
       "mounted": false,
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 f854d847516..dda8e14d4bd 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.110",
+      "mac": "08:00:38:35:ac:24",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.110",
+      "mac": "08:00:38:35:a4:12",
       "management": true,
       "mountable": false,
       "mounted": false,
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 e452a58d6f8..774bb2ad1d8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.111",
+      "mac": "08:00:38:35:ab:5c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.111",
+      "mac": "08:00:38:35:a3:ae",
       "management": true,
       "mountable": false,
       "mounted": false,
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 3a7191120ee..64bf7d07a71 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.112",
+      "mac": "08:00:38:35:ab:da",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.112",
+      "mac": "08:00:38:35:a3:ed",
       "management": true,
       "mountable": false,
       "mounted": false,
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 9999828786a..05006374fe0 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.113",
+      "mac": "08:00:38:35:ab:b2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.113",
+      "mac": "08:00:38:35:a3:d9",
       "management": true,
       "mountable": false,
       "mounted": false,
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 23143338a58..ea530e8184d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.114",
+      "mac": "08:00:38:35:aa:20",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.114",
+      "mac": "08:00:38:35:a3:10",
       "management": true,
       "mountable": false,
       "mounted": false,
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 31533f3b323..138c3c20959 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.115",
+      "mac": "08:00:38:35:ab:e4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.115",
+      "mac": "",
       "management": true,
       "mountable": false,
       "mounted": false,
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 3b7b73ba7d4..b3915864a07 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.116",
+      "mac": "08:00:38:35:ac:14",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.116",
+      "mac": "08:00:38:35:a4:0a",
       "management": true,
       "mountable": false,
       "mounted": false,
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 275ade49ecc..34bb494aec2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.117",
+      "mac": "08:00:38:35:ab:fa",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.117",
+      "mac": "08:00:38:35:a3:fd",
       "management": true,
       "mountable": false,
       "mounted": false,
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 bfc59ab14d7..559315a1a6c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.118",
+      "mac": "08:00:38:35:ab:b0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.118",
+      "mac": "08:00:38:35:a3:d8",
       "management": true,
       "mountable": false,
       "mounted": false,
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 ee68496f377..315fab2a76f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.119",
+      "mac": "08:00:38:35:ac:68",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.119",
+      "mac": "",
       "management": true,
       "mountable": false,
       "mounted": false,
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 d58fccd8b4b..5b0e759f536 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.57",
+      "mac": "08:00:38:35:ab:40",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.57",
+      "mac": "08:00:38:35:a3:a0",
       "management": true,
       "mountable": false,
       "mounted": false,
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 66f54e588d7..79851c05066 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.120",
+      "mac": "08:00:38:35:ac:66",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.120",
+      "mac": "08:00:38:35:a4:33",
       "management": true,
       "mountable": false,
       "mounted": false,
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 6ece3679095..be9d42bb01d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.121",
+      "mac": "08:00:38:35:ab:66",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.121",
+      "mac": "",
       "management": true,
       "mountable": false,
       "mounted": false,
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 cc852719d15..c7c533de007 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.122",
+      "mac": "08:00:38:35:ab:50",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.122",
+      "mac": "08:00:38:35:a3:a8",
       "management": true,
       "mountable": false,
       "mounted": false,
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 25c8fe836a4..4e396d0f627 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.58",
+      "mac": "08:00:38:35:ab:56",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.58",
+      "mac": "08:00:38:35:a3:ab",
       "management": true,
       "mountable": false,
       "mounted": false,
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 8cafa492ab7..c6061d3ca20 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
@@ -27,6 +27,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.59",
+      "mac": "08:00:38:35:ab:d8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -45,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.2.59",
+      "mac": "08:00:38:35:a3:ec",
       "management": true,
       "mountable": false,
       "mounted": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
index 012e75905c2..f4c7a4c7126 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:85:be",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.1",
+      "mac": "00:30:48:7f:85:bf",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.101",
+      "mac": "00:30:48:96:d6:b5",
       "management": true,
       "mountable": false,
       "network_address": "genepi-1-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
index 27c61eb5f4a..6728bb1124c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:fc",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.10",
+      "mac": "00:30:48:7f:41:fd",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.110",
+      "mac": "00:30:48:96:d4:2d",
       "management": true,
       "mountable": false,
       "network_address": "genepi-10-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
index a15fa0de261..3114b639595 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:42:06",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.11",
+      "mac": "00:30:48:7f:42:07",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.111",
+      "mac": "00:30:48:96:d6:90",
       "management": true,
       "mountable": false,
       "network_address": "genepi-11-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
index 3d50047cd15..ca9a982ea98 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7e:a3:d4",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.12",
+      "mac": "00:30:48:7e:a3:d5",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.112",
+      "mac": "",
       "management": true,
       "mountable": false,
       "network_address": "genepi-12-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
index 31751c0cef5..3acb0ac4efd 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:3e:c6",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.13",
+      "mac": "00:30:48:7f:3e:c7",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.113",
+      "mac": "00:30:48:96:d4:9a",
       "management": true,
       "mountable": false,
       "network_address": "genepi-13-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
index 342694b1458..0aeccc97df7 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:f2",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.14",
+      "mac": "00:30:48:7f:41:f3",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.114",
+      "mac": "00:30:48:96:d3:40",
       "management": true,
       "mountable": false,
       "network_address": "genepi-14-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
index 8b4c568139b..5fd8f248103 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:3e:f2",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.15",
+      "mac": "00:30:48:7f:3e:f3",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.115",
+      "mac": "00:30:48:96:d3:2f",
       "management": true,
       "mountable": false,
       "network_address": "genepi-15-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
index 7c993dbcd4b..f252a1d2972 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:3e:b8",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.16",
+      "mac": "00:30:48:7f:3e:b9",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.116",
+      "mac": "00:30:48:96:d4:37",
       "management": true,
       "mountable": false,
       "network_address": "genepi-16-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
index 28528642069..9f08a0d83ea 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:8a:8c",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.17",
+      "mac": "00:30:48:7f:8a:8d",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.117",
+      "mac": "00:30:48:96:d2:42",
       "management": true,
       "mountable": false,
       "network_address": "genepi-17-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
index 134d5db96d2..00e89e42060 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:85:fa",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.18",
+      "mac": "00:30:48:7f:85:fb",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.118",
+      "mac": "00:30:48:96:d3:4d",
       "management": true,
       "mountable": false,
       "network_address": "genepi-18-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
index 1225cd4fd2d..fdb6a66577e 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:8a:8a",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.19",
+      "mac": "00:30:48:7f:8a:8b",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.119",
+      "mac": "00:30:48:96:d1:f5",
       "management": true,
       "mountable": false,
       "network_address": "genepi-19-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
index 216eade3924..b24e7eb92e6 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:91:62",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.2",
+      "mac": "00:30:48:7f:91:63",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.102",
+      "mac": "00:30:48:96:d1:e2",
       "management": true,
       "mountable": false,
       "network_address": "genepi-2-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
index 6ba164ea947..f04ea4bbac4 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:8a:86",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.20",
+      "mac": "00:30:48:7f:8a:87",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.120",
+      "mac": "00:30:48:96:d3:bf",
       "management": true,
       "mountable": false,
       "network_address": "genepi-20-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
index adecfd796ed..5fe5c39b139 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:3e:f0",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.21",
+      "mac": "00:30:48:7f:3e:f1",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.121",
+      "mac": "00:30:48:96:d3:56",
       "management": true,
       "mountable": false,
       "network_address": "genepi-21-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
index d7b64859234..43b99bd95d5 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:f4",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.22",
+      "mac": "00:30:48:7f:41:f5",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.122",
+      "mac": "",
       "management": true,
       "mountable": false,
       "network_address": "genepi-22-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
index cead0b76d96..6fc68b7859e 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:dc",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.23",
+      "mac": "00:30:48:7f:29:dd",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.123",
+      "mac": "00:30:48:96:d2:d1",
       "management": true,
       "mountable": false,
       "network_address": "genepi-23-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
index 88d8133c49c..22bf124cdd2 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:de",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.24",
+      "mac": "00:30:48:7f:29:df",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.124",
+      "mac": "00:30:48:96:d6:ff",
       "management": true,
       "mountable": false,
       "network_address": "genepi-24-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
index bbf8e879e78..1027efef39b 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:5a",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.25",
+      "mac": "00:30:48:7f:41:5b",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.125",
+      "mac": "00:30:48:96:d3:2d",
       "management": true,
       "mountable": false,
       "network_address": "genepi-25-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
index 9fdac4f9823..d29dd616a73 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:5c",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.26",
+      "mac": "00:30:48:7f:41:5d",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.126",
+      "mac": "00:30:48:96:d6:08",
       "management": true,
       "mountable": false,
       "network_address": "genepi-26-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
index 898302d0cdc..9d71aecbd84 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:4e",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.27",
+      "mac": "00:30:48:7f:41:4f",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.127",
+      "mac": "00:30:48:96:d3:1f",
       "management": true,
       "mountable": false,
       "network_address": "genepi-27-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
index 6868500fc99..b983e19e101 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:5e",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.28",
+      "mac": "00:30:48:7f:41:5f",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.128",
+      "mac": "",
       "management": true,
       "mountable": false,
       "network_address": "genepi-28-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
index 15e2cacb11e..5b21bc73168 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:ec",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.29",
+      "mac": "00:30:48:7f:29:ed",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.129",
+      "mac": "00:30:48:96:d2:db",
       "management": true,
       "mountable": false,
       "network_address": "genepi-29-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
index a507b8ab7e4..1703dacb9aa 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:3f:0a",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.3",
+      "mac": "00:30:48:7f:3f:0b",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.103",
+      "mac": "00:30:48:96:d3:44",
       "management": true,
       "mountable": false,
       "network_address": "genepi-3-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
index dcc4985e4c0..16d3edc3fe7 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:da",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.30",
+      "mac": "00:30:48:7f:29:db",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.130",
+      "mac": "00:30:48:96:d4:2f",
       "management": true,
       "mountable": false,
       "network_address": "genepi-30-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
index 2f9d8094e02..1e341d7d37f 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.31",
+      "mac": "00:30:48:7F:41:57",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.131",
+      "mac": "",
       "management": true,
       "mountable": false,
       "network_address": "genepi-31-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
index cd700db8ab9..041d713c372 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:41:50",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.32",
+      "mac": "00:30:48:7f:41:51",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.132",
+      "mac": "00:30:48:96:d7:84",
       "management": true,
       "mountable": false,
       "network_address": "genepi-32-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
index 717fe2dcdc3..7448b202e9c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:ee",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.33",
+      "mac": "00:30:48:7f:29:ef",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.133",
+      "mac": "00:30:48:96:d2:dc",
       "management": true,
       "mountable": false,
       "network_address": "genepi-33-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
index 91572c42649..3f88e05b3b6 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:40",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.34",
+      "mac": "00:30:48:7f:29:41",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.134",
+      "mac": "00:30:48:96:d2:dd",
       "management": true,
       "mountable": false,
       "network_address": "genepi-34-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
index 29399c98f84..678cddf398e 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:44:8c",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.4",
+      "mac": "00:30:48:7F:44:8D",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.104",
+      "mac": "",
       "management": true,
       "mountable": false,
       "network_address": "genepi-4-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
index 31f7c59a5a1..bbf5c7ef91d 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:c1:b4:a6",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.5",
+      "mac": "00:30:48:c1:b4:a7",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.105",
+      "mac": "",
       "management": true,
       "mountable": false,
       "network_address": "genepi-5-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
index e57a5fc01d3..c5e4d0edb0c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.6",
+      "mac": "00:30:48:7F:29:F3",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.106",
+      "mac": "",
       "management": true,
       "mountable": false,
       "network_address": "genepi-6-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
index 0a0b63897f9..e781d9f0c7f 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:e0",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.7",
+      "mac": "00:30:48:7f:29:e1",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.107",
+      "mac": "00:30:48:96:d1:d2",
       "management": true,
       "mountable": false,
       "network_address": "genepi-7-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
index 4c82d17391c..3879a3bc413 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:29:e2",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.8",
+      "mac": "00:30:48:7f:29:e3",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.108",
+      "mac": "00:30:48:96:d6:94",
       "management": true,
       "mountable": false,
       "network_address": "genepi-8-bmc.grenoble.grid5000.fr",
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
index a7383c049a1..d89a46f4405 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
@@ -26,6 +26,7 @@
       "device": "eth0",
       "enabled": false,
       "interface": "Ethernet",
+      "mac": "00:30:48:7f:3e:ea",
       "management": false,
       "rate": 1000000000
     },
@@ -34,6 +35,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.16.9",
+      "mac": "00:30:48:7f:3e:eb",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -44,6 +46,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "192.168.1.109",
+      "mac": "00:30:48:96:d4:8e",
       "management": true,
       "mountable": false,
       "network_address": "genepi-9-bmc.grenoble.grid5000.fr",
diff --git a/generators/input/grenoble.rb b/generators/input/grenoble.rb
index 1b7abab31a7..66a3e611da0 100755
--- a/generators/input/grenoble.rb
+++ b/generators/input/grenoble.rb
@@ -67,6 +67,7 @@ site :grenoble do |site_uid|
           :device => "eth0",
           :enabled => false,
           :management => false,
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0')
         },
         {
           :interface => 'Ethernet',
@@ -77,7 +78,8 @@ site :grenoble do |site_uid|
           :mounted => true,
           :management => false,
           :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr")
+          :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth1')
         },
         {
           :interface => 'Ethernet',
@@ -86,9 +88,10 @@ site :grenoble do |site_uid|
           :mountable => false,
           :management => true,
           :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr")
+          :ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_mgt')
         }]
-      end      
+      end
     end
   end
 
@@ -149,7 +152,8 @@ site :grenoble do |site_uid|
           :management => false,
 	  :vendor => 'Intel', :version => "Device 10c9 (rev 01)",
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr")
+          :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0')
         },
         {
           :interface => 'Ethernet',
@@ -158,7 +162,8 @@ site :grenoble do |site_uid|
           :enabled => false,
           :mountable => false,
           :mounted => false,
-          :management => false
+          :management => false,
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth1')
         },
         {
           :interface => 'Ethernet',
@@ -168,7 +173,8 @@ site :grenoble do |site_uid|
           :mountable => false,
           :management => true,
           :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr")
+          :ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_mgt')
         }]
       end
     end
@@ -227,10 +233,11 @@ site :grenoble do |site_uid|
           :management => false,
 	  :vendor => 'Intel', :version => "Device 10c9 (rev 01)",
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr")
+          :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0')
         }]
       end
-    end    
+    end
   end
 
   cluster :edel do |cluster_uid|
@@ -290,7 +297,8 @@ site :grenoble do |site_uid|
           :mountable => true,
           :management => false,
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr")
+          :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0')
         },
         {
           :interface => 'Ethernet',
@@ -308,7 +316,8 @@ site :grenoble do |site_uid|
           :mountable => false,
           :management => true,
           :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr")
+          :ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_mgt')
         }]
       end      
     end
diff --git a/generators/input/grenoble.yaml b/generators/input/grenoble.yaml
index 47aa6afe07a..7fe30234d22 100644
--- a/generators/input/grenoble.yaml
+++ b/generators/input/grenoble.yaml
@@ -105,7 +105,7 @@ edel-10:
   ip_ib1: ""
   ip_mgt: 192.168.2.60
   mac_mgt: ""
-edel-11
+edel-11:
   mac_eth0: 08:00:38:35:ab:90
   ip_eth0: 172.16.16.61
   mac_eth1: 08:00:38:35:ab:91
@@ -896,6 +896,7 @@ genepi-28:
   ip_ib0: 172.16.18.28
   ip_ib1: ""
   ip_mgt: 192.168.1.128
+  mac_mgt: ""
 genepi-29:
   mac_eth0: 00:30:48:7f:29:ec
   ip_eth0: ""
@@ -984,7 +985,7 @@ genepi-5:
   ip_eth1: 172.16.16.5
   ip_ib0: 172.16.18.5
   ip_ib1: ""
-  ip_mgt: 192.168.1.105:
+  ip_mgt: 192.168.1.105
   mac_mgt: ""
 genepi-6:
   mac_eth0: ""
-- 
GitLab