From bb3b61830a2553474e1f5f8e3ec6a69737ced822 Mon Sep 17 00:00:00 2001
From: Gaetan SIMO <gaetan.simo@inria.fr>
Date: Sat, 9 Apr 2011 13:26:54 +0200
Subject: [PATCH] [environments] adding all new lenny environments to the api.
 WARNING : not yet in lille and toulouse for respectivily kadeploy-server and
 frontend disk memory insuffisance.

---
 .../environments/lenny-x64-base-2.3.json      |  8 +--
 .../environments/lenny-x64-big-2.3.json       | 40 +++++++++++
 .../environments/lenny-x64-min-2.3.json       | 34 ++++++++++
 .../environments/lenny-x64-nfs-2.3.json       | 40 +++++++++++
 .../environments/lenny-x64-xen-2.3.json       | 40 +++++++++++
 .../clusters/adonis/nodes/adonis-1.json       |  2 +-
 .../clusters/adonis/nodes/adonis-10.json      |  2 +-
 .../clusters/adonis/nodes/adonis-11.json      |  2 +-
 .../clusters/adonis/nodes/adonis-12.json      |  2 +-
 .../clusters/adonis/nodes/adonis-2.json       |  2 +-
 .../clusters/adonis/nodes/adonis-3.json       |  2 +-
 .../clusters/adonis/nodes/adonis-4.json       |  2 +-
 .../clusters/adonis/nodes/adonis-5.json       |  2 +-
 .../clusters/adonis/nodes/adonis-6.json       |  2 +-
 .../clusters/adonis/nodes/adonis-7.json       |  2 +-
 .../clusters/adonis/nodes/adonis-8.json       |  2 +-
 .../clusters/adonis/nodes/adonis-9.json       |  2 +-
 .../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/griffon/nodes/griffon-1.json     |  2 +-
 .../clusters/griffon/nodes/griffon-11.json    |  2 +-
 .../clusters/griffon/nodes/griffon-12.json    |  2 +-
 .../clusters/griffon/nodes/griffon-13.json    |  2 +-
 .../clusters/griffon/nodes/griffon-14.json    |  2 +-
 .../clusters/griffon/nodes/griffon-15.json    |  2 +-
 .../clusters/griffon/nodes/griffon-16.json    |  2 +-
 .../clusters/griffon/nodes/griffon-17.json    |  2 +-
 .../clusters/griffon/nodes/griffon-18.json    |  2 +-
 .../clusters/griffon/nodes/griffon-19.json    |  2 +-
 .../clusters/griffon/nodes/griffon-2.json     |  2 +-
 .../clusters/griffon/nodes/griffon-20.json    |  2 +-
 .../clusters/griffon/nodes/griffon-22.json    |  2 +-
 .../clusters/griffon/nodes/griffon-23.json    |  2 +-
 .../clusters/griffon/nodes/griffon-24.json    |  2 +-
 .../clusters/griffon/nodes/griffon-25.json    |  2 +-
 .../clusters/griffon/nodes/griffon-26.json    |  2 +-
 .../clusters/griffon/nodes/griffon-27.json    |  2 +-
 .../clusters/griffon/nodes/griffon-3.json     |  2 +-
 .../clusters/griffon/nodes/griffon-30.json    |  2 +-
 .../clusters/griffon/nodes/griffon-31.json    |  2 +-
 .../clusters/griffon/nodes/griffon-32.json    |  2 +-
 .../clusters/griffon/nodes/griffon-33.json    |  2 +-
 .../clusters/griffon/nodes/griffon-34.json    |  2 +-
 .../clusters/griffon/nodes/griffon-35.json    |  2 +-
 .../clusters/griffon/nodes/griffon-36.json    |  2 +-
 .../clusters/griffon/nodes/griffon-37.json    |  2 +-
 .../clusters/griffon/nodes/griffon-38.json    |  2 +-
 .../clusters/griffon/nodes/griffon-39.json    |  2 +-
 .../clusters/griffon/nodes/griffon-4.json     |  2 +-
 .../clusters/griffon/nodes/griffon-40.json    |  2 +-
 .../clusters/griffon/nodes/griffon-41.json    |  2 +-
 .../clusters/griffon/nodes/griffon-42.json    |  2 +-
 .../clusters/griffon/nodes/griffon-43.json    |  2 +-
 .../clusters/griffon/nodes/griffon-44.json    |  2 +-
 .../clusters/griffon/nodes/griffon-45.json    |  2 +-
 .../clusters/griffon/nodes/griffon-46.json    |  2 +-
 .../clusters/griffon/nodes/griffon-47.json    |  2 +-
 .../clusters/griffon/nodes/griffon-48.json    |  2 +-
 .../clusters/griffon/nodes/griffon-49.json    |  2 +-
 .../clusters/griffon/nodes/griffon-5.json     |  2 +-
 .../clusters/griffon/nodes/griffon-50.json    |  2 +-
 .../clusters/griffon/nodes/griffon-51.json    |  2 +-
 .../clusters/griffon/nodes/griffon-52.json    |  2 +-
 .../clusters/griffon/nodes/griffon-53.json    |  2 +-
 .../clusters/griffon/nodes/griffon-54.json    |  2 +-
 .../clusters/griffon/nodes/griffon-55.json    |  2 +-
 .../clusters/griffon/nodes/griffon-56.json    |  2 +-
 .../clusters/griffon/nodes/griffon-57.json    |  2 +-
 .../clusters/griffon/nodes/griffon-58.json    |  2 +-
 .../clusters/griffon/nodes/griffon-59.json    |  2 +-
 .../clusters/griffon/nodes/griffon-60.json    |  2 +-
 .../clusters/griffon/nodes/griffon-61.json    |  2 +-
 .../clusters/griffon/nodes/griffon-62.json    |  2 +-
 .../clusters/griffon/nodes/griffon-63.json    |  2 +-
 .../clusters/griffon/nodes/griffon-64.json    |  2 +-
 .../clusters/griffon/nodes/griffon-65.json    |  2 +-
 .../clusters/griffon/nodes/griffon-66.json    |  2 +-
 .../clusters/griffon/nodes/griffon-67.json    |  2 +-
 .../clusters/griffon/nodes/griffon-68.json    |  2 +-
 .../clusters/griffon/nodes/griffon-69.json    |  2 +-
 .../clusters/griffon/nodes/griffon-7.json     |  2 +-
 .../clusters/griffon/nodes/griffon-70.json    |  2 +-
 .../clusters/griffon/nodes/griffon-71.json    |  2 +-
 .../clusters/griffon/nodes/griffon-72.json    |  2 +-
 .../clusters/griffon/nodes/griffon-73.json    |  2 +-
 .../clusters/griffon/nodes/griffon-74.json    |  2 +-
 .../clusters/griffon/nodes/griffon-75.json    |  2 +-
 .../clusters/griffon/nodes/griffon-76.json    |  2 +-
 .../clusters/griffon/nodes/griffon-77.json    |  2 +-
 .../clusters/griffon/nodes/griffon-78.json    |  2 +-
 .../clusters/griffon/nodes/griffon-79.json    |  2 +-
 .../clusters/griffon/nodes/griffon-8.json     |  2 +-
 .../clusters/griffon/nodes/griffon-80.json    |  2 +-
 .../clusters/griffon/nodes/griffon-81.json    |  2 +-
 .../clusters/griffon/nodes/griffon-82.json    |  2 +-
 .../clusters/griffon/nodes/griffon-83.json    |  2 +-
 .../clusters/griffon/nodes/griffon-84.json    |  2 +-
 .../clusters/griffon/nodes/griffon-85.json    |  2 +-
 .../clusters/griffon/nodes/griffon-88.json    |  2 +-
 .../clusters/griffon/nodes/griffon-89.json    |  2 +-
 .../clusters/griffon/nodes/griffon-9.json     |  2 +-
 .../clusters/griffon/nodes/griffon-90.json    |  2 +-
 .../clusters/griffon/nodes/griffon-91.json    |  2 +-
 .../clusters/griffon/nodes/griffon-92.json    |  2 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-1.json |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-10.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-100.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-101.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-102.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-103.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-104.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-105.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-106.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-107.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-108.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-11.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-12.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-127.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-128.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-129.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-13.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-130.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-131.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-132.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-133.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-134.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-135.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-136.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-137.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-138.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-139.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-14.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-140.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-141.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-142.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-143.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-144.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-145.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-146.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-147.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-148.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-149.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-15.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-150.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-151.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-152.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-153.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-154.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-155.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-156.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-157.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-158.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-159.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-16.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-160.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-161.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-162.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-17.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-18.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-19.json      |  4 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-2.json |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-20.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-22.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-23.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-236.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-237.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-238.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-239.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-24.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-240.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-241.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-242.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-243.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-244.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-245.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-246.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-247.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-248.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-249.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-250.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-251.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-252.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-253.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-254.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-255.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-256.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-257.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-258.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-259.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-26.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-260.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-261.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-262.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-263.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-264.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-266.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-268.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-269.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-27.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-270.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-271.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-272.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-273.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-274.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-275.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-276.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-277.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-278.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-279.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-28.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-280.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-281.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-282.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-283.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-285.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-286.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-287.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-288.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-289.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-291.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-292.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-293.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-294.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-295.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-296.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-297.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-298.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-299.json     |  4 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-3.json |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-30.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-300.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-301.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-302.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-303.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-304.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-305.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-306.json     |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-31.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-32.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-33.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-34.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-35.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-36.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-37.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-38.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-39.json      |  4 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-4.json |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-40.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-41.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-42.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-43.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-44.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-45.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-46.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-47.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-48.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-49.json      |  4 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-5.json |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-50.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-51.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-52.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-54.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-55.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-56.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-57.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-58.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-59.json      |  4 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-6.json |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-71.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-73.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-74.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-75.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-76.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-77.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-78.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-79.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-80.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-82.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-83.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-84.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-85.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-86.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-87.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-88.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-89.json      |  4 +-
 .../orsay/clusters/gdx/nodes/gdx-90.json      |  4 +-
 .../clusters/helios/nodes/helios-1.json       |  8 +--
 .../clusters/helios/nodes/helios-10.json      |  8 +--
 .../clusters/helios/nodes/helios-11.json      |  8 +--
 .../clusters/helios/nodes/helios-12.json      |  8 +--
 .../clusters/helios/nodes/helios-13.json      |  8 +--
 .../clusters/helios/nodes/helios-14.json      |  8 +--
 .../clusters/helios/nodes/helios-15.json      |  8 +--
 .../clusters/helios/nodes/helios-16.json      |  8 +--
 .../clusters/helios/nodes/helios-17.json      |  8 +--
 .../clusters/helios/nodes/helios-18.json      |  8 +--
 .../clusters/helios/nodes/helios-19.json      |  8 +--
 .../clusters/helios/nodes/helios-2.json       |  8 +--
 .../clusters/helios/nodes/helios-20.json      |  8 +--
 .../clusters/helios/nodes/helios-21.json      |  8 +--
 .../clusters/helios/nodes/helios-22.json      |  8 +--
 .../clusters/helios/nodes/helios-23.json      |  8 +--
 .../clusters/helios/nodes/helios-24.json      |  8 +--
 .../clusters/helios/nodes/helios-25.json      |  8 +--
 .../clusters/helios/nodes/helios-26.json      |  8 +--
 .../clusters/helios/nodes/helios-27.json      |  8 +--
 .../clusters/helios/nodes/helios-28.json      |  8 +--
 .../clusters/helios/nodes/helios-29.json      |  8 +--
 .../clusters/helios/nodes/helios-3.json       |  8 +--
 .../clusters/helios/nodes/helios-30.json      |  8 +--
 .../clusters/helios/nodes/helios-31.json      |  8 +--
 .../clusters/helios/nodes/helios-32.json      |  8 +--
 .../clusters/helios/nodes/helios-33.json      |  8 +--
 .../clusters/helios/nodes/helios-34.json      |  8 +--
 .../clusters/helios/nodes/helios-35.json      |  8 +--
 .../clusters/helios/nodes/helios-36.json      |  8 +--
 .../clusters/helios/nodes/helios-37.json      |  8 +--
 .../clusters/helios/nodes/helios-38.json      |  8 +--
 .../clusters/helios/nodes/helios-39.json      |  8 +--
 .../clusters/helios/nodes/helios-4.json       |  8 +--
 .../clusters/helios/nodes/helios-40.json      |  8 +--
 .../clusters/helios/nodes/helios-41.json      |  8 +--
 .../clusters/helios/nodes/helios-42.json      |  8 +--
 .../clusters/helios/nodes/helios-43.json      |  8 +--
 .../clusters/helios/nodes/helios-44.json      |  8 +--
 .../clusters/helios/nodes/helios-45.json      |  8 +--
 .../clusters/helios/nodes/helios-46.json      |  8 +--
 .../clusters/helios/nodes/helios-47.json      |  8 +--
 .../clusters/helios/nodes/helios-48.json      |  8 +--
 .../clusters/helios/nodes/helios-49.json      |  8 +--
 .../clusters/helios/nodes/helios-5.json       |  8 +--
 .../clusters/helios/nodes/helios-50.json      |  8 +--
 .../clusters/helios/nodes/helios-51.json      |  8 +--
 .../clusters/helios/nodes/helios-52.json      |  8 +--
 .../clusters/helios/nodes/helios-53.json      |  8 +--
 .../clusters/helios/nodes/helios-54.json      |  8 +--
 .../clusters/helios/nodes/helios-55.json      |  8 +--
 .../clusters/helios/nodes/helios-56.json      |  8 +--
 .../clusters/helios/nodes/helios-6.json       |  8 +--
 .../clusters/helios/nodes/helios-7.json       |  8 +--
 .../clusters/helios/nodes/helios-8.json       |  8 +--
 .../clusters/helios/nodes/helios-9.json       |  8 +--
 .../sophia/clusters/sol/nodes/sol-1.json      |  4 +-
 .../sophia/clusters/sol/nodes/sol-10.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-11.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-12.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-13.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-14.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-15.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-16.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-17.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-18.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-19.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-2.json      |  4 +-
 .../sophia/clusters/sol/nodes/sol-20.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-21.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-22.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-23.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-24.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-25.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-26.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-27.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-28.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-29.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-3.json      |  4 +-
 .../sophia/clusters/sol/nodes/sol-30.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-31.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-32.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-33.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-34.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-35.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-36.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-37.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-38.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-39.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-4.json      |  4 +-
 .../sophia/clusters/sol/nodes/sol-40.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-41.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-42.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-43.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-44.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-45.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-46.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-47.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-48.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-49.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-5.json      |  4 +-
 .../sophia/clusters/sol/nodes/sol-50.json     |  4 +-
 .../sophia/clusters/sol/nodes/sol-6.json      |  4 +-
 .../sophia/clusters/sol/nodes/sol-7.json      |  4 +-
 .../sophia/clusters/sol/nodes/sol-8.json      |  4 +-
 .../sophia/clusters/sol/nodes/sol-9.json      |  4 +-
 .../sophia/clusters/suno/nodes/suno-1.json    |  4 +-
 .../sophia/clusters/suno/nodes/suno-10.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-11.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-12.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-13.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-14.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-15.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-16.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-17.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-18.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-19.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-2.json    |  4 +-
 .../sophia/clusters/suno/nodes/suno-20.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-21.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-22.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-23.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-24.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-25.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-26.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-27.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-28.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-29.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-3.json    |  4 +-
 .../sophia/clusters/suno/nodes/suno-30.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-31.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-32.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-33.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-34.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-35.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-36.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-37.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-38.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-39.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-4.json    |  4 +-
 .../sophia/clusters/suno/nodes/suno-40.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-41.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-42.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-43.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-44.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-45.json   |  4 +-
 .../sophia/clusters/suno/nodes/suno-5.json    |  4 +-
 .../sophia/clusters/suno/nodes/suno-6.json    |  4 +-
 .../sophia/clusters/suno/nodes/suno-7.json    |  4 +-
 .../sophia/clusters/suno/nodes/suno-8.json    |  4 +-
 .../sophia/clusters/suno/nodes/suno-9.json    |  4 +-
 generators/input/bordeaux.rb                  |  3 +-
 generators/input/environments.rb              | 66 ++++++++++++++++++-
 generators/input/grenoble.rb                  |  3 +-
 generators/input/lille.rb                     |  2 +-
 generators/input/lyon.rb                      |  3 +-
 generators/input/nancy.rb                     |  3 +-
 generators/input/orsay.rb                     |  7 +-
 generators/input/rennes.rb                    |  3 +-
 generators/input/sophia.rb                    |  3 +-
 generators/input/toulouse.rb                  |  2 +-
 517 files changed, 1184 insertions(+), 967 deletions(-)
 create mode 100644 data/grid5000/environments/lenny-x64-big-2.3.json
 create mode 100644 data/grid5000/environments/lenny-x64-min-2.3.json
 create mode 100644 data/grid5000/environments/lenny-x64-nfs-2.3.json
 create mode 100644 data/grid5000/environments/lenny-x64-xen-2.3.json

diff --git a/data/grid5000/environments/lenny-x64-base-2.3.json b/data/grid5000/environments/lenny-x64-base-2.3.json
index 6ba15360447..18863124f0c 100644
--- a/data/grid5000/environments/lenny-x64-base-2.3.json
+++ b/data/grid5000/environments/lenny-x64-base-2.3.json
@@ -3,10 +3,6 @@
     {
       "login": "root",
       "password": "grid5000"
-    },
-    {
-      "login": "g5k",
-      "password": "grid5000"
     }
   ],
   "applications": [
@@ -27,7 +23,7 @@
     }
   ],
   "file": {
-    "md5": "ae5a1ab50f5654c47ddfb2d5ee2ed978",
+    "md5": "3c255364f601fc19271783269ef541c2",
     "path": "/grid5000/images/lenny-x64-base-2.3.tgz"
   },
   "kernel": "2.6.26.2",
@@ -39,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "lenny-x64-base-2.3",
-  "valid_on": "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti",
+  "valid_on": "bordeplage , bordereau ,  adonis , edel , genepi , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno , pastel , violette",
   "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-big-2.3.json b/data/grid5000/environments/lenny-x64-big-2.3.json
new file mode 100644
index 00000000000..bbc212f72c2
--- /dev/null
+++ b/data/grid5000/environments/lenny-x64-big-2.3.json
@@ -0,0 +1,40 @@
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "XEmacs",
+    "JED",
+    "nano",
+    "JOE",
+    "Perl",
+    "Python",
+    "Ruby"
+  ],
+  "based_on": "Debian version lenny for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "e5870c72c1a5386c287935dcf39a8a23",
+    "path": "/grid5000/images/lenny-x64-big-2.3.tgz"
+  },
+  "kernel": "2.6.26.2",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-big-2.3",
+  "valid_on": "bordeplage , bordereau ,  adonis , edel , genepi , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno , pastel , violette",
+  "x11_forwarding": true
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-min-2.3.json b/data/grid5000/environments/lenny-x64-min-2.3.json
new file mode 100644
index 00000000000..8b2ce270f54
--- /dev/null
+++ b/data/grid5000/environments/lenny-x64-min-2.3.json
@@ -0,0 +1,34 @@
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "nano",
+    "Perl"
+  ],
+  "based_on": "Debian version lenny for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "a39dcad30821b7404d8eb5ac1388f650",
+    "path": "/grid5000/images/lenny-x64-min-0.8.tgz"
+  },
+  "kernel": "2.6.26.2",
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-min-2.3",
+  "valid_on": "bordeplage , bordereau ,  adonis , edel , genepi , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno , pastel , violette",
+  "x11_forwarding": true
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-nfs-2.3.json b/data/grid5000/environments/lenny-x64-nfs-2.3.json
new file mode 100644
index 00000000000..1d0295ce0b9
--- /dev/null
+++ b/data/grid5000/environments/lenny-x64-nfs-2.3.json
@@ -0,0 +1,40 @@
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "XEmacs",
+    "JED",
+    "nano",
+    "JOE",
+    "Perl",
+    "Python",
+    "Ruby"
+  ],
+  "based_on": "Debian version lenny for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "12522a436a2790df866f1ecd63680eff",
+    "path": "/grid5000/images/lenny-x64-nfs-2.3.tgz"
+  },
+  "kernel": "2.6.26.2",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-nfs-2.3",
+  "valid_on": "bordeplage , bordereau ,  adonis , edel , genepi , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno , pastel , violette",
+  "x11_forwarding": true
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-xen-2.3.json b/data/grid5000/environments/lenny-x64-xen-2.3.json
new file mode 100644
index 00000000000..99d141c70e6
--- /dev/null
+++ b/data/grid5000/environments/lenny-x64-xen-2.3.json
@@ -0,0 +1,40 @@
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "XEmacs",
+    "JED",
+    "nano",
+    "JOE",
+    "Perl",
+    "Python",
+    "Ruby"
+  ],
+  "based_on": "Debian version lenny for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "8e4f0eff055c61ed8a51265c1c9afd58",
+    "path": "/grid5000/images/lenny-x64-xen-2.3.tgz"
+  },
+  "kernel": "2.6.26.2",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "lenny-x64-xen-2.3",
+  "valid_on": "bordeplage , bordereau ,  adonis , edel , genepi , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno , pastel , violette",
+  "x11_forwarding": true
+}
\ No newline at end of file
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 b6fac7f30ad..47ad40aaf08 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.131",
+      "ip": "172.16.16.131",
       "management": false,
       "mountable": true,
       "mounted": true,
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 36b6e0a5657..1911c50938c 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.140",
+      "ip": "172.16.16.140",
       "management": false,
       "mountable": true,
       "mounted": true,
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 85f14f6c29f..d8b1b2ee8e1 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.141",
+      "ip": "172.16.16.141",
       "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 664281ae2b7..35041fdef43 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.142",
+      "ip": "172.16.16.142",
       "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 1db77be7dd0..cf303242179 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.132",
+      "ip": "172.16.16.132",
       "management": false,
       "mountable": true,
       "mounted": true,
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 a69c1b4f7fe..399ecbd27ce 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.133",
+      "ip": "172.16.16.133",
       "management": false,
       "mountable": true,
       "mounted": true,
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 55f139e23a9..4db950912d8 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.134",
+      "ip": "172.16.16.134",
       "management": false,
       "mountable": true,
       "mounted": true,
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 79071af3c9b..beb9580b214 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.135",
+      "ip": "172.16.16.135",
       "management": false,
       "mountable": true,
       "mounted": true,
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 925e84ee039..d4744f09501 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.136",
+      "ip": "172.16.16.136",
       "management": false,
       "mountable": true,
       "mounted": true,
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 0f89f84d3d3..79eb8c82ac3 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.137",
+      "ip": "172.16.16.137",
       "management": false,
       "mountable": true,
       "mounted": true,
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 e0a1c606f8d..683474667a4 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.138",
+      "ip": "172.16.16.138",
       "management": false,
       "mountable": true,
       "mounted": true,
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 5bfb8195237..ef619087adf 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.139",
+      "ip": "172.16.16.139",
       "management": false,
       "mountable": true,
       "mounted": true,
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 5d06d862ad4..939b4e213f4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.51",
+      "ip": "172.16.16.51",
       "management": false,
       "mountable": true,
       "mounted": true,
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 bd97dba84f3..f52fae55a1b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.60",
+      "ip": "172.16.16.60",
       "management": false,
       "mountable": true,
       "mounted": true,
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 b2588144b39..4e711bef356 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.61",
+      "ip": "172.16.16.61",
       "management": false,
       "mountable": true,
       "mounted": true,
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 f01762be2ac..09e83553be2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.62",
+      "ip": "172.16.16.62",
       "management": false,
       "mountable": true,
       "mounted": true,
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 358e39ceb09..3159f6fd3c3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.63",
+      "ip": "172.16.16.63",
       "management": false,
       "mountable": true,
       "mounted": true,
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 3f4d12a00ba..18dab92a7cc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.64",
+      "ip": "172.16.16.64",
       "management": false,
       "mountable": true,
       "mounted": true,
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 6af64c79664..757f4b756f4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.65",
+      "ip": "172.16.16.65",
       "management": false,
       "mountable": true,
       "mounted": true,
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 f3cefff6a58..c92d392a92e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.66",
+      "ip": "172.16.16.66",
       "management": false,
       "mountable": true,
       "mounted": true,
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 3a4583ceb02..d8d58374330 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.67",
+      "ip": "172.16.16.67",
       "management": false,
       "mountable": true,
       "mounted": true,
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 38da5373a54..e1ef3ceec9b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.68",
+      "ip": "172.16.16.68",
       "management": false,
       "mountable": true,
       "mounted": true,
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 b2cf303ae8d..041a76919d8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.69",
+      "ip": "172.16.16.69",
       "management": false,
       "mountable": true,
       "mounted": true,
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 086e540fdd4..8c712d48caa 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.52",
+      "ip": "172.16.16.52",
       "management": false,
       "mountable": true,
       "mounted": true,
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 c1b09b88821..c7af133ed14 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.70",
+      "ip": "172.16.16.70",
       "management": false,
       "mountable": true,
       "mounted": true,
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 18235485e67..bdb5b28b865 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.71",
+      "ip": "172.16.16.71",
       "management": false,
       "mountable": true,
       "mounted": true,
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 4c160efcfe9..095bc6627e9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.72",
+      "ip": "172.16.16.72",
       "management": false,
       "mountable": true,
       "mounted": true,
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 30950aef913..17498d13ae5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.73",
+      "ip": "172.16.16.73",
       "management": false,
       "mountable": true,
       "mounted": true,
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 ffff58c0dbb..14abc6ba3c2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.74",
+      "ip": "172.16.16.74",
       "management": false,
       "mountable": true,
       "mounted": true,
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 9998af5ff97..f1ea081375d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.75",
+      "ip": "172.16.16.75",
       "management": false,
       "mountable": true,
       "mounted": true,
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 c0a3e025f43..12267fdb0a5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.76",
+      "ip": "172.16.16.76",
       "management": false,
       "mountable": true,
       "mounted": true,
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 bf60d7281a4..96cd68a018f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.77",
+      "ip": "172.16.16.77",
       "management": false,
       "mountable": true,
       "mounted": true,
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 852c33b3956..f77fc74541c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.78",
+      "ip": "172.16.16.78",
       "management": false,
       "mountable": true,
       "mounted": true,
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 3e04f7cddf3..a236f9c9fe8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.79",
+      "ip": "172.16.16.79",
       "management": false,
       "mountable": true,
       "mounted": true,
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 291e09fb6a9..3e02e3b8196 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.53",
+      "ip": "172.16.16.53",
       "management": false,
       "mountable": true,
       "mounted": true,
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 64b186e8957..6e57f6f34a5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.80",
+      "ip": "172.16.16.80",
       "management": false,
       "mountable": true,
       "mounted": true,
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 843cd19342c..9dc7afea146 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.81",
+      "ip": "172.16.16.81",
       "management": false,
       "mountable": true,
       "mounted": true,
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 54b63008884..78f51bce151 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.82",
+      "ip": "172.16.16.82",
       "management": false,
       "mountable": true,
       "mounted": true,
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 657cee13e2d..c50df7e4aea 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.83",
+      "ip": "172.16.16.83",
       "management": false,
       "mountable": true,
       "mounted": true,
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 62d4f1933a4..dfab0c102d1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.84",
+      "ip": "172.16.16.84",
       "management": false,
       "mountable": true,
       "mounted": true,
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 457ef4217b7..3389205b55f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.85",
+      "ip": "172.16.16.85",
       "management": false,
       "mountable": true,
       "mounted": true,
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 62cf88fd18b..a382eda1a72 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.86",
+      "ip": "172.16.16.86",
       "management": false,
       "mountable": true,
       "mounted": true,
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 7385fd6702d..01b4656a43b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.87",
+      "ip": "172.16.16.87",
       "management": false,
       "mountable": true,
       "mounted": true,
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 55b5b03fa43..92ae9fa337d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.88",
+      "ip": "172.16.16.88",
       "management": false,
       "mountable": true,
       "mounted": true,
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 7471980f0a8..3159e754637 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.89",
+      "ip": "172.16.16.89",
       "management": false,
       "mountable": true,
       "mounted": true,
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 045331aef1f..54aad2081cb 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.54",
+      "ip": "172.16.16.54",
       "management": false,
       "mountable": true,
       "mounted": true,
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 c01a994e6b6..9a7c5e6890a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.90",
+      "ip": "172.16.16.90",
       "management": false,
       "mountable": true,
       "mounted": true,
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 90e6f6712bd..e18fd8cb7b1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.91",
+      "ip": "172.16.16.91",
       "management": false,
       "mountable": true,
       "mounted": true,
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 747f2e21fb9..5b3f677ba5e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.92",
+      "ip": "172.16.16.92",
       "management": false,
       "mountable": true,
       "mounted": true,
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 cb8c92e1ae2..6ee524723fc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.93",
+      "ip": "172.16.16.93",
       "management": false,
       "mountable": true,
       "mounted": true,
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 6ee0225254a..2e341c20753 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.94",
+      "ip": "172.16.16.94",
       "management": false,
       "mountable": true,
       "mounted": true,
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 7ecf032da46..8897c018e1b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.95",
+      "ip": "172.16.16.95",
       "management": false,
       "mountable": true,
       "mounted": true,
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 63a1befa499..5839524f0e8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.96",
+      "ip": "172.16.16.96",
       "management": false,
       "mountable": true,
       "mounted": true,
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 eb366063c85..11f14627f33 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.97",
+      "ip": "172.16.16.97",
       "management": false,
       "mountable": true,
       "mounted": true,
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 842c053eaec..1c393fb5f51 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.98",
+      "ip": "172.16.16.98",
       "management": false,
       "mountable": true,
       "mounted": true,
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 f6d73d04ccb..72f41130def 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.99",
+      "ip": "172.16.16.99",
       "management": false,
       "mountable": true,
       "mounted": true,
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 f7808c14a08..1dff97b9120 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.55",
+      "ip": "172.16.16.55",
       "management": false,
       "mountable": true,
       "mounted": true,
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 39d9b301878..b6121a3790a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.100",
+      "ip": "172.16.16.100",
       "management": false,
       "mountable": true,
       "mounted": true,
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 bb4bea46006..7dd09b6df64 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.101",
+      "ip": "172.16.16.101",
       "management": false,
       "mountable": true,
       "mounted": true,
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 b3a27602905..6ddff92ff08 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.102",
+      "ip": "172.16.16.102",
       "management": false,
       "mountable": true,
       "mounted": true,
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 3f61ffd2179..eb0dbbe01bf 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.103",
+      "ip": "172.16.16.103",
       "management": false,
       "mountable": true,
       "mounted": true,
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 c8d3ec64d1f..4785f64d1a3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.104",
+      "ip": "172.16.16.104",
       "management": false,
       "mountable": true,
       "mounted": true,
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 c4471177029..6d25e8e8a84 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.105",
+      "ip": "172.16.16.105",
       "management": false,
       "mountable": true,
       "mounted": true,
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 ae0e096fe99..87990a40466 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.106",
+      "ip": "172.16.16.106",
       "management": false,
       "mountable": true,
       "mounted": true,
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 2cf53cbca22..674dea27e21 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.107",
+      "ip": "172.16.16.107",
       "management": false,
       "mountable": true,
       "mounted": true,
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 2055de31e4a..45bdfc16a75 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.108",
+      "ip": "172.16.16.108",
       "management": false,
       "mountable": true,
       "mounted": true,
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 2ccb4fd87d3..35e283cdad8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.109",
+      "ip": "172.16.16.109",
       "management": false,
       "mountable": true,
       "mounted": true,
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 b11c8b98ea4..97e9aa63652 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.56",
+      "ip": "172.16.16.56",
       "management": false,
       "mountable": true,
       "mounted": true,
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 efd5e9da52c..77d5b34a583 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.110",
+      "ip": "172.16.16.110",
       "management": false,
       "mountable": true,
       "mounted": true,
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 adc8b870411..e6d8d7af505 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.111",
+      "ip": "172.16.16.111",
       "management": false,
       "mountable": true,
       "mounted": true,
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 89fdab93723..5cdd9180e0a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.112",
+      "ip": "172.16.16.112",
       "management": false,
       "mountable": true,
       "mounted": true,
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 ec97ac6f5f0..152b2902403 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.113",
+      "ip": "172.16.16.113",
       "management": false,
       "mountable": true,
       "mounted": true,
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 8b359b76084..20dde280a51 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.114",
+      "ip": "172.16.16.114",
       "management": false,
       "mountable": true,
       "mounted": true,
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 650b37b8200..0587537bd8e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.115",
+      "ip": "172.16.16.115",
       "management": false,
       "mountable": true,
       "mounted": true,
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 2e35d92c1d7..ed963cbb8b6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.116",
+      "ip": "172.16.16.116",
       "management": false,
       "mountable": true,
       "mounted": true,
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 dbf32d7d32f..f134489e200 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.117",
+      "ip": "172.16.16.117",
       "management": false,
       "mountable": true,
       "mounted": true,
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 1a7f10e2967..7791eaff585 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.118",
+      "ip": "172.16.16.118",
       "management": false,
       "mountable": true,
       "mounted": true,
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 db050b51575..832e5fe3373 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.119",
+      "ip": "172.16.16.119",
       "management": false,
       "mountable": true,
       "mounted": true,
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 84cf1a0125d..f1c3a090cf6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.57",
+      "ip": "172.16.16.57",
       "management": false,
       "mountable": true,
       "mounted": true,
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 763edeae606..c0db11360f7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.120",
+      "ip": "172.16.16.120",
       "management": false,
       "mountable": true,
       "mounted": true,
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 134c0ebbd9e..7f4b28b3562 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.121",
+      "ip": "172.16.16.121",
       "management": false,
       "mountable": true,
       "mounted": true,
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 9ee0991e23a..01279eeb35e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.122",
+      "ip": "172.16.16.122",
       "management": false,
       "mountable": true,
       "mounted": true,
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 6b6d58964b3..00a61a01d71 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.58",
+      "ip": "172.16.16.58",
       "management": false,
       "mountable": true,
       "mounted": true,
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 088c22e318b..2be2f109bad 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
@@ -13,7 +13,7 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.18.59",
+      "ip": "172.16.16.59",
       "management": false,
       "mountable": true,
       "mounted": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
index a1785fd6d4b..93b8220e7f5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-1.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "1",
+      "switch_port": "Gi1/0/1",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
index be347c6e923..70826d6b165 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-11.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "25",
+      "switch_port": "Gi1/0/25",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
index efa79d1527e..6ede6b92f00 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-12.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "26",
+      "switch_port": "Gi1/0/26",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
index b45d005252c..2001e3513f7 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-13.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "27",
+      "switch_port": "Gi1/0/27",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
index 55362783c4b..bcc9c9ee83d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-14.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "28",
+      "switch_port": "Gi1/0/28",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
index 94f32225c63..a8255ec027e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-15.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "29",
+      "switch_port": "Gi1/0/29",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
index 1c051e371cc..ab29eaae8b0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-16.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "30",
+      "switch_port": "Gi1/0/30",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
index 35abd97e16c..399d037ffcb 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-17.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "31",
+      "switch_port": "Gi1/0/31",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
index 61c6077fac7..f15da02be41 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-18.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "32",
+      "switch_port": "Gi1/0/32",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
index ce2bee801e9..deacfe563b9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-19.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "33",
+      "switch_port": "Gi1/0/33",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
index ee05a3e8bd2..df89ae37abc 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-2.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "2",
+      "switch_port": "Gi1/0/2",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
index 7ca3a49e56a..414698ef370 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-20.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "34",
+      "switch_port": "Gi1/0/34",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
index 1246e5ab212..2a9c4c4daa7 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-22.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "36",
+      "switch_port": "Gi1/0/36",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
index bb2485628b4..c43c3842368 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-23.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "37",
+      "switch_port": "Gi1/0/37",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
index 365bf944be0..8d0fbf864e2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-24.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "38",
+      "switch_port": "Gi1/0/38",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
index ec3283bccc1..299e0b8c332 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-25.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "39",
+      "switch_port": "Gi1/0/39",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
index 999fb8fee2f..bf9ea85b9db 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-26.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "40",
+      "switch_port": "Gi1/0/40",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
index 010a930ed6e..b5cad89fdb9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-27.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "41",
+      "switch_port": "Gi1/0/41",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
index 08d9b95fb1d..c9e500f2228 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-3.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "3",
+      "switch_port": "Gi1/0/3",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
index db05f2c2f75..c9ef17bae78 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-30.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "1",
+      "switch_port": "Gi1/0/1",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
index 2a76adb22ce..b8033b0f31d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-31.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "2",
+      "switch_port": "Gi1/0/2",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
index 3ac708e1838..e5dd9ad5c3a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-32.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "3",
+      "switch_port": "Gi1/0/3",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
index 0fd3577f79b..53e44f69975 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-33.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "4",
+      "switch_port": "Gi1/0/4",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
index 371f8f47b82..2061b1e1e6e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-34.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "5",
+      "switch_port": "Gi1/0/5",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
index 2c47a940136..88857a0d76e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-35.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "6",
+      "switch_port": "Gi1/0/6",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
index d3302b6abe8..4ac04468d27 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-36.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "7",
+      "switch_port": "Gi1/0/7",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
index eef5ec2b931..eac90e020c4 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-37.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "8",
+      "switch_port": "Gi1/0/8",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
index aa06a71b35b..a21108c57ba 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-38.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "9",
+      "switch_port": "Gi1/0/9",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
index d242b1a739a..6e777bcaf32 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-39.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "25",
+      "switch_port": "Gi1/0/25",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
index 932d8611cd2..97d5577311c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-4.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "4",
+      "switch_port": "Gi1/0/4",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
index 8b9f21d5589..ce729f270b1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-40.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "26",
+      "switch_port": "Gi1/0/26",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
index cc92710f0e9..92052f10625 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-41.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "27",
+      "switch_port": "Gi1/0/27",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
index 0c62cec4c34..a385ef8d4e8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-42.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "28",
+      "switch_port": "Gi1/0/28",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
index 06caad50120..b3ee4bf2032 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-43.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "29",
+      "switch_port": "Gi1/0/29",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
index 4ec80c25cba..1bcd1966db5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-44.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "30",
+      "switch_port": "Gi1/0/30",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
index ec2fe656b5e..fe2fe64bf90 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-45.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "31",
+      "switch_port": "Gi1/0/31",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
index 0b5906d0961..6e6c43ccebe 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-46.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "32",
+      "switch_port": "Gi1/0/32",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
index 37983b596e5..2416cb8f082 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-47.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "33",
+      "switch_port": "Gi1/0/33",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
index 67c1b0ee65c..f3ee4bd2e69 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-48.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "34",
+      "switch_port": "Gi1/0/34",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
index aaa27e26797..371972cb10d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-49.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "35",
+      "switch_port": "Gi1/0/35",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
index 03b352a0b8f..e37bf3392df 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-5.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "5",
+      "switch_port": "Gi1/0/5",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
index 8e64e7e9439..08a882f72c2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-50.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "36",
+      "switch_port": "Gi1/0/37",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
index e4543653393..88a6a186033 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-51.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "37",
+      "switch_port": "Gi1/0/36",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
index 5a8735fc262..0acbc2230bb 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-52.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "38",
+      "switch_port": "Gi1/0/38",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
index e8072e7dbe1..057a607e735 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-53.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "39",
+      "switch_port": "Gi1/0/39",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
index 3c6615dbca9..ec9bb2c9408 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-54.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "40",
+      "switch_port": "Gi1/0/40",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
index 223bd2d1b0e..dda214c989e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-55.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "41",
+      "switch_port": "Gi1/0/41",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
index 91bb159b424..03bd465d50c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-56.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "42",
+      "switch_port": "Gi1/0/42",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
index 7b5548c8625..0db9d88ace1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-57.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon2",
-      "switch_port": "43",
+      "switch_port": "Gi1/0/43",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
index 0d12c014848..2c7fa6455de 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-58.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "1",
+      "switch_port": "Gi1/0/11",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
index 83dcf1ea150..872a66a8afd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-59.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "2",
+      "switch_port": "Gi1/0/12",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
index 7248800062e..16d7864ed4b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-60.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "3",
+      "switch_port": "Gi1/0/13",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
index a5e2118bd2e..97c060dbceb 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-61.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "4",
+      "switch_port": "Gi1/0/4",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
index 0d7ee8aa19a..edb6449bdfe 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-62.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "5",
+      "switch_port": "Gi1/0/5",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
index 791bbf99fc8..b36476b6851 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-63.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "6",
+      "switch_port": "Gi1/0/6",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
index 0a6e9e39056..18b73fc6a2c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-64.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "7",
+      "switch_port": "Gi1/0/7",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
index c4dfdd4d309..fc33f3f97fa 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-65.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "8",
+      "switch_port": "Gi1/0/8",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
index d0fb70dd96a..7e3584138f2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-66.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "9",
+      "switch_port": "Gi1/0/9",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
index 393d3ca4695..7862e9550b0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-67.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "10",
+      "switch_port": "Gi1/0/10",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
index 408e86e3d81..d891bee9a57 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-68.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "11",
+      "switch_port": "Gi1/0/11",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
index a12a6a91152..8006bb34e05 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-69.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "12",
+      "switch_port": "Gi1/0/12",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
index 4f2b476ccbc..f5bf3f2b28c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-7.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "7",
+      "switch_port": "Gi1/0/7",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
index 0b65c2103d6..5d17859fe72 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-70.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "13",
+      "switch_port": "Gi1/0/13",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
index dcb253b0213..c5ef0f08381 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-71.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "14",
+      "switch_port": "Gi1/0/14",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
index 5953be0d15e..3e4490659bc 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-72.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "15",
+      "switch_port": "Gi1/0/15",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
index e6bf94aaf96..94573c9cac8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-73.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "25",
+      "switch_port": "Gi1/0/25",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
index 6ca5dd53b03..f7cb7b93b8c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-74.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "26",
+      "switch_port": "Gi1/0/26",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
index d9c1e900bb9..052f406f647 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-75.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "27",
+      "switch_port": "Gi1/0/27",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
index db235c18a41..809143566b2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-76.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "28",
+      "switch_port": "Gi1/0/28",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
index 8f08ee86004..49a26e0c5a8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-77.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "29",
+      "switch_port": "Gi1/0/29",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
index 1f5f1630b90..81c42ed0b3d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-78.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "30",
+      "switch_port": "Gi1/0/30",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
index ef4dd94c1c8..7a1fa99954c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-79.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "31",
+      "switch_port": "Gi1/0/31",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
index 4588fdeceb9..003cb5d347c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-8.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "8",
+      "switch_port": "Gi1/0/8",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
index 4bc81e10c8b..9ce267b31d5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-80.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "32",
+      "switch_port": "Gi1/0/32",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
index 3849468f77d..d32f3bcf3ea 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-81.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "33",
+      "switch_port": "Gi1/0/33",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
index 94bc819ba0b..7fb8b6f1327 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-82.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "34",
+      "switch_port": "Gi1/0/34",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
index 3503679b9e8..9ba95667441 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-83.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "35",
+      "switch_port": "Gi1/0/35",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
index b9da580e4e5..b45aabdfc47 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-84.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "36",
+      "switch_port": "Gi1/0/36",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
index 306e36faab4..ce5d8d81c19 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-85.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "37",
+      "switch_port": "Gi1/0/37",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
index 2c4325f7872..330f0ebd95c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-88.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "40",
+      "switch_port": "Gi1/0/40",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
index 29adfad8790..fdd72b0b973 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-89.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "41",
+      "switch_port": "Gi1/0/41",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
index c2ad2cd3367..349d28094fd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-9.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon1",
-      "switch_port": "9",
+      "switch_port": "Gi1/0/10",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
index 4df0135b297..7293fb40c2f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-90.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "42",
+      "switch_port": "Gi1/0/42",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
index 6f0ca16efcb..5b53729f904 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-91.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "43",
+      "switch_port": "Gi1/0/43",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
index 62329445dc6..e7b31420f37 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
@@ -27,7 +27,7 @@
       "network_address": "griffon-92.nancy.grid5000.fr",
       "rate": 1000000000,
       "switch": "sgriffon3",
-      "switch_port": "44",
+      "switch_port": "Gi1/0/44",
       "vendor": "intel",
       "version": "80003ES2LAN"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
index c1b84e55658..9528c055c58 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.1",
-      "mac": null,
+      "mac": "00:11:25:c4:35:7e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.128.1",
-      "mac": null,
+      "mac": "00:11:25:c4:35:7f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
index 61a1463eb2d..02716097d45 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.10",
-      "mac": null,
+      "mac": "00:11:25:c4:33:38",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.128.10",
-      "mac": null,
+      "mac": "00:11:25:c4:33:39",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
index 5c8e9704012..7584806c0f0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.28",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:be",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.136.28",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:bf",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
index 206cfce4d6c..4f39a7f1c00 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.29",
-      "mac": null,
+      "mac": "00:11:25:c4:51:8c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.136.29",
-      "mac": null,
+      "mac": "00:11:25:c4:51:8d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
index d2689d9bfbe..bd4bd6a3284 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.30",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:de",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.136.30",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:df",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
index af6d0cc3492..c7a7d863cee 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.31",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:fc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.136.31",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:fd",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
index 0a40f66ba7a..db5647e91b2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.32",
-      "mac": null,
+      "mac": "00:11:25:c4:52:4a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.136.32",
-      "mac": null,
+      "mac": "00:11:25:c4:52:4b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
index b8a14948e09..67a1d2679cb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.33",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:0a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.136.33",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:0b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
index abab9b653aa..53546928577 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.34",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:c2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.136.34",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:c3",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
index 7c493253081..a168bbeeed6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.35",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:d2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.136.35",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:d3",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
index fa843e48f66..09b79c5f64c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.9.36",
-      "mac": null,
+      "mac": "00:11:25:c4:51:bc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.136.36",
-      "mac": null,
+      "mac": "00:11:25:c4:51:bd",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
index d7162e18532..ff9141c5c38 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.11",
-      "mac": null,
+      "mac": "00:11:25:c4:34:3e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.128.11",
-      "mac": null,
+      "mac": "00:11:25:c4:34:3f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
index ca138eae2e8..555c714439e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.12",
-      "mac": null,
+      "mac": "00:11:25:c4:35:42",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.128.12",
-      "mac": null,
+      "mac": "00:11:25:c4:35:43",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
index 80536047bd8..10555df3365 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.19",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:94",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.138.19",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:95",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
index 9fb325d1a1f..4bdde2b74e2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.20",
-      "mac": null,
+      "mac": "00:11:25:c4:53:18",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.138.20",
-      "mac": null,
+      "mac": "00:11:25:c4:53:19",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
index 1d2700cf54c..df4ae4f0822 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.21",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:80",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.138.21",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:81",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
index 850d4be6f7b..2ec2e1d8357 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.13",
-      "mac": null,
+      "mac": "00:11:25:c4:34:48",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.129.13",
-      "mac": null,
+      "mac": "00:11:25:c4:34:49",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
index ead5e94f925..29ccec24588 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.22",
-      "mac": null,
+      "mac": "00:11:25:c4:54:6a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.138.22",
-      "mac": null,
+      "mac": "00:11:25:c4:54:6b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
index bac4c03b5b9..ea60b23993a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.23",
-      "mac": null,
+      "mac": "00:11:25:c4:54:86",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.138.23",
-      "mac": null,
+      "mac": "00:11:25:c4:54:87",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
index c17bb2e5ca3..60f695425ea 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.11.24",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:58",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.138.24",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:59",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
index dd4266affc8..0c33d3161f4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.25",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:82",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.139.25",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:83",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
index 421cb215e09..9bf52264cf0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.26",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:4e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.139.26",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:4f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
index d56158a6b6f..d52151db375 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.27",
-      "mac": null,
+      "mac": "00:11:25:c4:53:e6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.139.27",
-      "mac": null,
+      "mac": "00:11:25:c4:53:e7",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
index 17e5a52cc07..abd61ae3e4d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.28",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:40",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.139.28",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:41",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
index f8ac533362b..47cfb153e6d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.29",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:e2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.139.29",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:e3",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
index 20764e3a362..c15a0168c80 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.30",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:4a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.139.30",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:4b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
index 788424d3a7f..42d6345aee0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.31",
-      "mac": null,
+      "mac": "00:11:25:c4:38:de",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.139.31",
-      "mac": null,
+      "mac": "00:11:25:c4:38:df",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
index 6ba6e5e3d58..29ebaed44fe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.14",
-      "mac": null,
+      "mac": "00:11:25:c4:34:3c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.129.14",
-      "mac": null,
+      "mac": "00:11:25:c4:34:3d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
index 80709588b18..7551c476ed1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.32",
-      "mac": null,
+      "mac": "00:11:25:c4:24:02",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.139.32",
-      "mac": null,
+      "mac": "00:11:25:c4:24:03",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
index 4741f88dd7e..52d87be55e8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.33",
-      "mac": null,
+      "mac": "00:11:25:c4:3f:a8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.139.33",
-      "mac": null,
+      "mac": "00:11:25:c4:3f:a9",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
index 8b6545e6432..f83558aa8dc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.34",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:d8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.139.34",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:d9",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
index 781fd361ab2..0170cc51d40 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.35",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:aa",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.139.35",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:ab",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
index 0cbce61faa2..022794bf9ba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.12.36",
-      "mac": null,
+      "mac": "00:11:25:c4:50:0e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.139.36",
-      "mac": null,
+      "mac": "00:11:25:c4:50:0f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
index 1be1e25b338..15a6363c339 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.1",
-      "mac": null,
+      "mac": "00:11:25:c4:50:20",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.140.1",
-      "mac": null,
+      "mac": "00:11:25:c4:50:21",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
index 4939bf4a60f..dee4bf87cf3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.2",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:4c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.140.2",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:4d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
index 026de8d040f..ce48bdbb2b5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.3",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:fe",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.140.3",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:ff",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
index a1a1f7b0a37..701bf048029 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.4",
-      "mac": null,
+      "mac": "00:11:25:c4:51:06",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.140.4",
-      "mac": null,
+      "mac": "00:11:25:c4:51:07",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
index fd498a8a86e..b18d97d0f62 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.5",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:c0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.140.5",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:c1",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
index 5e3eb6e4a39..1f318b351ff 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.15",
-      "mac": null,
+      "mac": "00:11:25:c4:35:9b",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.129.15",
-      "mac": null,
+      "mac": "00:11:25:c4:35:9c",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
index 1c88014aab3..33c24f09fe9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.6",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:02",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.140.6",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:03",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
index 1dd54102571..1ec6260e941 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.7",
-      "mac": null,
+      "mac": "00:11:25:c4:53:78",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.140.7",
-      "mac": null,
+      "mac": "00:11:25:c4:53:79",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
index 05cbddc95c8..13f76a2c8d4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.8",
-      "mac": null,
+      "mac": "00:11:25:c4:50:b6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.140.8",
-      "mac": null,
+      "mac": "00:11:25:c4:50:b7",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
index 803015fdae3..45205465125 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.9",
-      "mac": null,
+      "mac": "00:11:25:c4:50:a8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.140.9",
-      "mac": null,
+      "mac": "00:11:25:c4:50:a9",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
index 725352a791a..5a519c090b1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.10",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:2a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.140.10",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:2b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
index 978e218cca1..31a43f70f83 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.11",
-      "mac": null,
+      "mac": "00:11:25:c4:50:a2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.140.11",
-      "mac": null,
+      "mac": "00:11:25:c4:50:a3",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
index 9282081e696..a308687f036 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.13.12",
-      "mac": null,
+      "mac": "00:11:25:c4:0b:06",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.140.12",
-      "mac": null,
+      "mac": "00:11:25:c4:0b:07",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
index 2756dffc28f..343c5b41557 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.13",
-      "mac": null,
+      "mac": "00:11:25:c4:52:ca",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.141.13",
-      "mac": null,
+      "mac": "00:11:25:c4:52:cb",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
index 6f8c9d4e256..db54037bbb8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.14",
-      "mac": null,
+      "mac": "00:11:25:c4:54:46",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.141.14",
-      "mac": null,
+      "mac": "00:11:25:c4:54:47",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
index 03b195582b8..21f3c44423a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.15",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:82",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.141.15",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:83",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
index 98d0c71bbe8..59b1905152c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.16",
-      "mac": null,
+      "mac": "00:11:25:c4:2e:ce",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.129.16",
-      "mac": null,
+      "mac": "00:11:25:c4:2e:cf",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
index 27ea9543ad8..fa4e84962a6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.16",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:3a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.141.16",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:3b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
index 0a77a4e9d02..f70d7e77836 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.17",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:8e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.141.17",
-      "mac": null,
+      "mac": "00:11:25:c4:4f:8f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
index 07f8992a665..78bfc3fc39f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.14.18",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:b8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.141.18",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:b9",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
index 31051b587cd..74af126a967 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.17",
-      "mac": null,
+      "mac": "00:11:25:c4:34:56",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.129.17",
-      "mac": null,
+      "mac": "00:11:25:c4:34:57",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
index 358afa4265f..317f34a2983 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.18",
-      "mac": null,
+      "mac": "00:11:25:c4:35:7a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.129.18",
-      "mac": null,
+      "mac": "00:11:25:c4:35:7b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
index 87399b64611..bc7832acb7a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.19",
-      "mac": null,
+      "mac": "00:11:25:c4:34:4c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.129.19",
-      "mac": null,
+      "mac": "00:11:25:c4:34:4d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
index 7b0b76b2c72..8df77b5cf14 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.2",
-      "mac": null,
+      "mac": "00:11:25:c4:35:56",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.128.2",
-      "mac": null,
+      "mac": "00:11:25:c4:35:57",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
index 8d24e1b08db..a07a334ca4e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.20",
-      "mac": null,
+      "mac": "00:11:25:c4:35:52",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.129.20",
-      "mac": null,
+      "mac": "00:11:25:c4:35:53",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
index 89b2f9fc80a..3d9873f9e16 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.22",
-      "mac": null,
+      "mac": "00:11:25:c4:34:5a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.129.22",
-      "mac": null,
+      "mac": "00:11:25:c4:34:5b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
index c56cc6e70b3..51e2dfb0a13 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.23",
-      "mac": null,
+      "mac": "00:11:25:c4:34:ea",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.129.23",
-      "mac": null,
+      "mac": "00:11:25:c4:34:eb",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
index 8383327f33b..5d8b4c3b92d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.20",
-      "mac": null,
+      "mac": "00:11:25:c4:39:ac",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.147.20",
-      "mac": null,
+      "mac": "00:11:25:c4:39:ad",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
index 8957cf84f23..58810744196 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.21",
-      "mac": null,
+      "mac": "00:11:25:c4:3c:80",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.147.21",
-      "mac": null,
+      "mac": "00:11:25:c4:3c:81",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
index e6161c1ee39..65938c0417f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.22",
-      "mac": null,
+      "mac": "00:11:25:c4:3c:7e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.147.22",
-      "mac": null,
+      "mac": "00:11:25:c4:3c:7f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
index 3f2123856db..e9635a6650b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.23",
-      "mac": null,
+      "mac": "00:11:25:c4:3f:50",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.147.23",
-      "mac": null,
+      "mac": "00:11:25:c4:3f:51",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
index e8277dc9c27..ab5d16b256b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.2.24",
-      "mac": null,
+      "mac": "00:11:25:c4:34:50",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.129.24",
-      "mac": null,
+      "mac": "00:11:25:c4:34:51",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
index e5dae353520..fc544aa8548 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.20.24",
-      "mac": null,
+      "mac": "00:11:25:c4:3e:34",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.147.24",
-      "mac": null,
+      "mac": "00:11:25:c4:3e:35",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
index 9dbdff694aa..4c8a2037ec7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.25",
-      "mac": null,
+      "mac": "00:11:25:c4:3c:74",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.148.25",
-      "mac": null,
+      "mac": "00:11:25:c4:3c:75",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
index 030367c0257..b8cc8f70657 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.26",
-      "mac": null,
+      "mac": "00:11:25:c4:2b:fc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.148.26",
-      "mac": null,
+      "mac": "00:11:25:c4:2b:fd",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
index fc5b6faed87..604a3d02ad8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.27",
-      "mac": null,
+      "mac": "00:11:25:c4:2b:58",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.148.27",
-      "mac": null,
+      "mac": "00:11:25:c4:2b:59",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
index c7aef7543c0..5de884063d8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.28",
-      "mac": null,
+      "mac": "00:11:25:c4:10:fa",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.148.28",
-      "mac": null,
+      "mac": "00:11:25:c4:10:fb",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
index dfce7e20b08..ebe14d0e578 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.29",
-      "mac": null,
+      "mac": "00:11:25:c4:3a:4e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.148.29",
-      "mac": null,
+      "mac": "00:11:25:c4:3a:4f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
index a8406d8a354..8703893dbc7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.30",
-      "mac": null,
+      "mac": "00:11:25:c4:38:e2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.148.30",
-      "mac": null,
+      "mac": "00:11:25:c4:38:e3",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
index c4d02f05c9c..c84541e1976 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.31",
-      "mac": null,
+      "mac": "00:11:25:c4:32:76",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.148.31",
-      "mac": null,
+      "mac": "00:11:25:c4:32:77",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
index c92938fb94b..66259c090f2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.32",
-      "mac": null,
+      "mac": "00:11:25:c4:31:fa",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.148.32",
-      "mac": null,
+      "mac": "00:11:25:c4:31:fb",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
index ebdd8cadf56..5486739bab8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.33",
-      "mac": null,
+      "mac": "00:11:25:c4:33:40",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.148.33",
-      "mac": null,
+      "mac": "00:11:25:c4:33:41",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
index 6ba0516205f..13c99f3fe5a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.34",
-      "mac": null,
+      "mac": "00:11:25:c4:3b:9a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.148.34",
-      "mac": null,
+      "mac": "00:11:25:c4:3b:9b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
index 270d194ade6..1ce7e289fda 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.35",
-      "mac": null,
+      "mac": "00:11:25:c4:3f:90",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.148.35",
-      "mac": null,
+      "mac": "00:11:25:c4:3f:91",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
index a1f9e7a065c..3925fba178a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.21.36",
-      "mac": null,
+      "mac": "00:11:25:c4:32:5a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.148.36",
-      "mac": null,
+      "mac": "00:11:25:c4:32:5b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
index 70b19b6109c..b9551224205 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.1",
-      "mac": null,
+      "mac": "00:11:25:c4:34:68",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.149.1",
-      "mac": null,
+      "mac": "00:11:25:c4:34:69",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
index 8ae623af206..cfca70d63c9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.2",
-      "mac": null,
+      "mac": "00:11:25:c4:35:b8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.149.2",
-      "mac": null,
+      "mac": "00:11:25:c4:35:b9",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
index 212f9f52dd9..202ec5215c0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.3",
-      "mac": null,
+      "mac": "00:11:25:c4:09:86",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.149.3",
-      "mac": null,
+      "mac": "00:11:25:c4:09:87",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
index 9c00de2de8f..d98391cc3b0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.4",
-      "mac": null,
+      "mac": "00:11:25:c4:35:90",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.149.4",
-      "mac": null,
+      "mac": "00:11:25:c4:35:91",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
index 487dcff4659..9497c9a716c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.5",
-      "mac": null,
+      "mac": "00:11:25:c4:35:62",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.149.5",
-      "mac": null,
+      "mac": "00:11:25:c4:35:63",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
index ab197d08cfc..86c135b01d8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.6",
-      "mac": null,
+      "mac": "00:11:25:c4:13:1a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.149.6",
-      "mac": null,
+      "mac": "00:11:25:c4:13:1b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
index 9e5976a3181..e730688442b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.7",
-      "mac": null,
+      "mac": "00:11:25:c4:35:6a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.149.7",
-      "mac": null,
+      "mac": "00:11:25:c4:35:6b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
index bf359e02d76..6afe598b664 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.26",
-      "mac": null,
+      "mac": "00:11:25:c4:35:a4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.130.26",
-      "mac": null,
+      "mac": "00:11:25:c4:35:a5",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
index 7298ed367c3..296949eea52 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.8",
-      "mac": null,
+      "mac": "00:11:25:c4:33:82",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.149.8",
-      "mac": null,
+      "mac": "00:11:25:c4:33:83",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
index 9ae4e3452d0..788f9e1ecf0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.9",
-      "mac": null,
+      "mac": "00:11:25:c4:2d:72",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.149.9",
-      "mac": null,
+      "mac": "00:11:25:c4:2d:73",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
index aa84c685bdb..56c11702138 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.10",
-      "mac": null,
+      "mac": "00:11:25:c4:34:e8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.149.10",
-      "mac": null,
+      "mac": "00:11:25:c4:34:e9",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
index 096a3ef3bad..c65c2f470f6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.11",
-      "mac": null,
+      "mac": "00:11:25:c4:35:88",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.149.11",
-      "mac": null,
+      "mac": "00:11:25:c4:35:89",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
index a47092e425d..5d864cc207d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.22.12",
-      "mac": null,
+      "mac": "00:11:25:c4:33:5e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.149.12",
-      "mac": null,
+      "mac": "00:11:25:c4:33:5f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
index 3e0e4628ae6..d4572d8f00d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.14",
-      "mac": null,
+      "mac": "00:11:25:c4:34:8a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.150.14",
-      "mac": null,
+      "mac": "00:11:25:c4:34:8b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
index 85959e4db67..25e4c90c718 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.16",
-      "mac": null,
+      "mac": "00:11:25:c4:34:4e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.150.16",
-      "mac": null,
+      "mac": "00:11:25:c4:34:4f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
index d57f019d223..e9504472f14 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.17",
-      "mac": null,
+      "mac": "00:11:25:c4:33:0e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.150.17",
-      "mac": null,
+      "mac": "00:11:25:c4:33:0f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
index f7cf7e4da3e..e05277a12d6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.27",
-      "mac": null,
+      "mac": "00:11:25:c4:31:4e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.130.27",
-      "mac": null,
+      "mac": "00:11:25:c4:31:4f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
index ccc6e303dae..bba88bbb933 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.18",
-      "mac": null,
+      "mac": "00:11:25:c4:35:48",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.150.18",
-      "mac": null,
+      "mac": "00:11:25:c4:35:49",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
index c3f70f5ba01..ea0c88c385a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.19",
-      "mac": null,
+      "mac": "00:11:25:c4:31:92",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.150.19",
-      "mac": null,
+      "mac": "00:11:25:c4:31:93",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
index f816438baec..5d4d4010219 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.20",
-      "mac": null,
+      "mac": "00:11:25:c4:2f:20",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.150.20",
-      "mac": null,
+      "mac": "00:11:25:c4:2f:21",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
index 5594ded0552..a1daf6f3b47 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.21",
-      "mac": null,
+      "mac": "00:11:25:c4:32:ee",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.150.21",
-      "mac": null,
+      "mac": "00:11:25:c4:32:ef",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
index 8f89d6ec5a8..3189e59a587 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.22",
-      "mac": null,
+      "mac": "00:11:25:c4:35:c0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.150.22",
-      "mac": null,
+      "mac": "00:11:25:c4:35:c1",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
index 96c28cf5404..3c28bb86cd6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.23",
-      "mac": null,
+      "mac": "00:11:25:c4:11:38",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.150.23",
-      "mac": null,
+      "mac": "00:11:25:c4:11:39",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
index b228325b2c4..54ec77262f0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.23.24",
-      "mac": null,
+      "mac": "00:11:25:c4:35:b6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.150.24",
-      "mac": null,
+      "mac": "00:11:25:c4:35:b7",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
index 2587c289911..67ddef0acf9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.25",
-      "mac": null,
+      "mac": "00:11:25:c4:34:58",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.151.25",
-      "mac": null,
+      "mac": "00:11:25:c4:34:59",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
index eb2595c9759..e2aa72e903b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.26",
-      "mac": null,
+      "mac": "00:11:25:c4:34:46",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.151.26",
-      "mac": null,
+      "mac": "00:11:25:c4:34:47",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
index 54f56d7652e..ff063bbf8ab 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.27",
-      "mac": null,
+      "mac": "00:11:25:c4:33:96",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.151.27",
-      "mac": null,
+      "mac": "00:11:25:c4:33:97",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
index 63302a86306..b19306f618b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.28",
-      "mac": null,
+      "mac": "00:11:25:c4:34:6e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.130.28",
-      "mac": null,
+      "mac": "00:11:25:c4:34:6f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
index fed402288c2..766c6670f4c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.28",
-      "mac": null,
+      "mac": "00:11:25:c4:33:20",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.151.28",
-      "mac": null,
+      "mac": "00:11:25:c4:33:21",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
index 20ecb968f94..bcb8201ede1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.29",
-      "mac": null,
+      "mac": "00:11:25:c4:33:18",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.151.29",
-      "mac": null,
+      "mac": "00:11:25:c4:33:19",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
index 413d1006c68..addefe5e3f8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.30",
-      "mac": null,
+      "mac": "00:11:25:c4:31:44",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.151.30",
-      "mac": null,
+      "mac": "00:11:25:c4:31:45",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
index b3ef1e3e486..3a8ad4ce9e5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.31",
-      "mac": null,
+      "mac": "00:11:25:c4:34:5e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.151.31",
-      "mac": null,
+      "mac": "00:11:25:c4:34:5f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
index 2e0120f1766..24d4d913799 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.33",
-      "mac": null,
+      "mac": "00:11:25:c4:35:be",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.151.33",
-      "mac": null,
+      "mac": "00:11:25:c4:35:bf",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
index 3bf60c73b03..e91c515acc3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.34",
-      "mac": null,
+      "mac": "00:11:25:c4:2a:c2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.151.34",
-      "mac": null,
+      "mac": "00:11:25:c4:2a:c3",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
index 8709973d95d..773004c9397 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.35",
-      "mac": null,
+      "mac": "00:11:25:c4:34:40",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.151.35",
-      "mac": null,
+      "mac": "00:11:25:c4:34:41",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
index 2f1f0501021..d43bb78aa57 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.24.36",
-      "mac": null,
+      "mac": "00:11:25:c4:34:66",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.151.36",
-      "mac": null,
+      "mac": "00:11:25:c4:34:67",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
index 5a7afd14f0a..ceecadef111 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.1",
-      "mac": null,
+      "mac": "00:11:25:c4:33:68",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.152.1",
-      "mac": null,
+      "mac": "00:11:25:c4:33:69",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
index 38c4d298cb6..1b4fa741547 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.3",
-      "mac": null,
+      "mac": "00:11:25:c4:33:1c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.152.3",
-      "mac": null,
+      "mac": "00:11:25:c4:33:1d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
index cf6f6efe456..36cfdef3b0c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.4",
-      "mac": null,
+      "mac": "00:11:25:c4:33:88",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.152.4",
-      "mac": null,
+      "mac": "00:11:25:c4:33:89",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
index 21b98a11326..8463e874b11 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.5",
-      "mac": null,
+      "mac": "00:11:25:c4:33:4a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.152.5",
-      "mac": null,
+      "mac": "00:11:25:c4:33:4b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
index 7470fef7e2a..08a16bd747b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.6",
-      "mac": null,
+      "mac": "00:11:25:c4:33:24",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.152.6",
-      "mac": null,
+      "mac": "00:11:25:c4:33:25",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
index 02288e4e9bc..f15e9288ab3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.7",
-      "mac": null,
+      "mac": "00:11:25:c4:33:7a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.152.7",
-      "mac": null,
+      "mac": "00:11:25:c4:33:7b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
index da322e5b1fe..7f91d4927e3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.8",
-      "mac": null,
+      "mac": "00:11:25:c4:20:06",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.152.8",
-      "mac": null,
+      "mac": "00:11:25:c4:20:07",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
index f3f02b49dd8..d385543af82 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.9",
-      "mac": null,
+      "mac": "00:11:25:c4:33:3c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.152.9",
-      "mac": null,
+      "mac": "00:11:25:c4:33:3d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
index fd74a3d0505..289f9742a7f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.10",
-      "mac": null,
+      "mac": "00:11:25:c4:33:48",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.152.10",
-      "mac": null,
+      "mac": "00:11:25:c4:33:49",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
index 4df36ceb6b0..3d234e0d316 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.11",
-      "mac": null,
+      "mac": "00:11:25:c4:33:46",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.152.11",
-      "mac": null,
+      "mac": "00:11:25:c4:33:47",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
index bc9adb5a45b..115c9f7697b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.3",
-      "mac": null,
+      "mac": "00:11:25:c4:35:3a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.128.3",
-      "mac": null,
+      "mac": "00:11:25:c4:35:3b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
index ac99afc1a64..215091c28e8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.30",
-      "mac": null,
+      "mac": "00:11:25:c4:35:2c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.130.30",
-      "mac": null,
+      "mac": "00:11:25:c4:35:2d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
index 1d41592d73d..0d66884d16d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.25.12",
-      "mac": null,
+      "mac": "00:11:25:c4:33:14",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.152.12",
-      "mac": null,
+      "mac": "00:11:25:c4:33:15",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
index e79d053c7f5..92d596f1a34 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.13",
-      "mac": null,
+      "mac": "00:11:25:c4:35:06",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.153.13",
-      "mac": null,
+      "mac": "00:11:25:c4:35:07",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
index 1eb2666451f..a2fd329a339 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.14",
-      "mac": null,
+      "mac": "00:11:25:c4:34:42",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.153.14",
-      "mac": null,
+      "mac": "00:11:25:c4:34:43",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
index f6086cec368..83b16ab43c3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.15",
-      "mac": null,
+      "mac": "00:11:25:c4:0f:10",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.153.15",
-      "mac": null,
+      "mac": "00:11:25:c4:0f:11",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
index 1cab08ea5c8..81e0107a34e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.16",
-      "mac": null,
+      "mac": "00:11:25:c4:33:58",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.153.16",
-      "mac": null,
+      "mac": "00:11:25:c4:33:59",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
index 987a95f4070..65eda2651e8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.17",
-      "mac": null,
+      "mac": "00:11:25:c4:34:62",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.153.17",
-      "mac": null,
+      "mac": "00:11:25:c4:34:63",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
index b480e75343a..0cf10c1e08a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.26.18",
-      "mac": null,
+      "mac": "00:11:25:c4:41:5a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.153.18",
-      "mac": null,
+      "mac": "00:11:25:c4:41:5b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
index 8b7ff6a6c35..e98c64cdbd2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.31",
-      "mac": null,
+      "mac": "00:11:25:c4:35:24",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.130.31",
-      "mac": null,
+      "mac": "00:11:25:c4:35:25",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
index f4661fdf4b2..8a41a7c6f11 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.32",
-      "mac": null,
+      "mac": "00:11:25:c4:35:08",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.130.32",
-      "mac": null,
+      "mac": "00:11:25:c4:35:09",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
index 7712a4ce7cf..39dd0cd057c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.33",
-      "mac": null,
+      "mac": "00:11:25:c4:34:70",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.130.33",
-      "mac": null,
+      "mac": "00:11:25:c4:34:71",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
index 20af1d04c1e..92704f2fc5e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.34",
-      "mac": null,
+      "mac": "00:11:25:c4:33:8e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.130.34",
-      "mac": null,
+      "mac": "00:11:25:c4:33:8f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
index d4f6be25cdf..59b8c59ba27 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.35",
-      "mac": null,
+      "mac": "00:11:25:c4:34:7a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.130.35",
-      "mac": null,
+      "mac": "00:11:25:c4:34:7b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
index 3f86341244b..5b82c467746 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.3.36",
-      "mac": null,
+      "mac": "00:11:25:c4:33:56",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.130.36",
-      "mac": null,
+      "mac": "00:11:25:c4:33:57",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
index a45823851d8..6f07b4f5d00 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.1",
-      "mac": null,
+      "mac": "00:11:25:c4:31:66",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.131.1",
-      "mac": null,
+      "mac": "00:11:25:c4:31:67",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
index 2ab8bd26738..28510eb02a7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.2",
-      "mac": null,
+      "mac": "00:11:25:c4:34:6c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.131.2",
-      "mac": null,
+      "mac": "00:11:25:c4:34:6d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
index 7dc49273c7a..1b80579a56d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.3",
-      "mac": null,
+      "mac": "00:11:25:c4:34:4a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.131.3",
-      "mac": null,
+      "mac": "00:11:25:c4:34:4b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
index f447c1079e8..b0d81cb19b5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.4",
-      "mac": null,
+      "mac": "00:11:25:c4:35:40",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.128.4",
-      "mac": null,
+      "mac": "00:11:25:c4:35:41",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
index b3781c3e32b..340f07cc2a9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.4",
-      "mac": null,
+      "mac": "00:11:25:c4:33:66",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.131.4",
-      "mac": null,
+      "mac": "00:11:25:c4:33:67",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
index 221be0425d9..0f70b576ffc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.5",
-      "mac": null,
+      "mac": "00:11:25:c4:34:86",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.131.5",
-      "mac": null,
+      "mac": "00:11:25:c4:34:87",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
index 3698c548091..750b45262ac 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.6",
-      "mac": null,
+      "mac": "00:11:25:c4:2b:f0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.131.6",
-      "mac": null,
+      "mac": "00:11:25:c4:2b:f1",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
index ef06c3dfce6..0808cc92004 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.7",
-      "mac": null,
+      "mac": "00:11:25:c4:33:2a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.131.7",
-      "mac": null,
+      "mac": "00:11:25:c4:33:2b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
index a1e81d039b7..b9da78c49b2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.8",
-      "mac": null,
+      "mac": "00:11:25:c4:2f:50",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.131.8",
-      "mac": null,
+      "mac": "00:11:25:c4:2f:51",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
index 352116fa17f..7b1ab77449b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.9",
-      "mac": null,
+      "mac": "00:11:25:c4:35:18",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.131.9",
-      "mac": null,
+      "mac": "00:11:25:c4:35:19",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
index 099a387b2f8..59e5fa398ae 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.10",
-      "mac": null,
+      "mac": "00:11:25:c4:09:c6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.131.10",
-      "mac": null,
+      "mac": "00:11:25:c4:09:c7",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
index ae4697fa291..95509602f39 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.11",
-      "mac": null,
+      "mac": "00:11:25:c4:35:99",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.131.11",
-      "mac": null,
+      "mac": "00:11:25:c4:35:9a",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
index 031179bca57..ba74072b0da 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.4.12",
-      "mac": null,
+      "mac": "00:11:25:c4:2d:6c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.131.12",
-      "mac": null,
+      "mac": "00:11:25:c4:2d:6d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
index 72944728930..1017bf4f9ef 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.13",
-      "mac": null,
+      "mac": "00:11:25:c4:33:16",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.132.13",
-      "mac": null,
+      "mac": "00:11:25:c4:33:17",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
index f7c00ccc304..f4abf5aae95 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.5",
-      "mac": null,
+      "mac": "00:11:25:c4:33:52",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.128.5",
-      "mac": null,
+      "mac": "00:11:25:c4:33:53",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
index f93bbdc0a88..e9a4115b51a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.14",
-      "mac": null,
+      "mac": "00:11:25:c4:33:92",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.132.14",
-      "mac": null,
+      "mac": "00:11:25:c4:33:93",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
index 3ccfafc56a1..8878f7863eb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.15",
-      "mac": null,
+      "mac": "00:11:25:c4:49:8e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.132.15",
-      "mac": null,
+      "mac": "00:11:25:c4:49:8f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
index 30a36cb65f6..661fdd81112 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.16",
-      "mac": null,
+      "mac": "00:11:25:c4:35:97",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.132.16",
-      "mac": null,
+      "mac": "00:11:25:c4:35:98",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
index b23064dcc17..e136fb78ada 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.18",
-      "mac": null,
+      "mac": "00:11:25:c4:35:bc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.132.18",
-      "mac": null,
+      "mac": "00:11:25:c4:35:bd",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
index ff98ff5265c..942bebba8fe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.19",
-      "mac": null,
+      "mac": "00:11:25:c4:3b:bc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.132.19",
-      "mac": null,
+      "mac": "00:11:25:c4:3b:bd",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
index 7733ded5ea7..c0848fe7cba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.20",
-      "mac": null,
+      "mac": "00:11:25:c4:3c:7c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.132.20",
-      "mac": null,
+      "mac": "00:11:25:c4:3c:7d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
index bcb781a2c5e..e17c510d43f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.21",
-      "mac": null,
+      "mac": "00:11:25:c4:3c:24",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.132.21",
-      "mac": null,
+      "mac": "00:11:25:c4:3c:25",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
index 6fba499286c..eb635cdb247 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.22",
-      "mac": null,
+      "mac": "00:11:25:c4:39:3e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.132.22",
-      "mac": null,
+      "mac": "00:11:25:c4:39:3f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
index ffb3dd91bba..cfb8a7217f3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.5.23",
-      "mac": null,
+      "mac": "00:11:25:c4:2e:30",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.132.23",
-      "mac": null,
+      "mac": "00:11:25:c4:2e:31",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
index 712a56b668c..0e38058d81a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.1.6",
-      "mac": null,
+      "mac": "00:11:25:c4:35:1e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.128.6",
-      "mac": null,
+      "mac": "00:11:25:c4:35:1f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
index 01496db93df..2f49dca7499 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.6.35",
-      "mac": null,
+      "mac": "00:11:25:c4:35:78",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.133.35",
-      "mac": null,
+      "mac": "00:11:25:c4:35:79",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
index c35758b0879..0b61bc63653 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.1",
-      "mac": null,
+      "mac": "00:11:25:c4:35:9e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.134.1",
-      "mac": null,
+      "mac": "00:11:25:c4:35:9f",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
index 67f0524d488..4a44b21f4ea 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.2",
-      "mac": null,
+      "mac": "00:11:25:c4:2d:0a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.134.2",
-      "mac": null,
+      "mac": "00:11:25:c4:2d:0b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
index 80a9486f0dc..7d67c9cfb2f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.3",
-      "mac": null,
+      "mac": "00:11:25:c4:39:ae",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.134.3",
-      "mac": null,
+      "mac": "00:11:25:c4:39:af",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
index 09bf10232b4..12dc49575da 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.4",
-      "mac": null,
+      "mac": "00:11:25:c4:2b:2c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.134.4",
-      "mac": null,
+      "mac": "00:11:25:c4:2b:2d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
index 953de0af8fd..7ecb925084b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.5",
-      "mac": null,
+      "mac": "00:11:25:c4:38:94",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.134.5",
-      "mac": null,
+      "mac": "00:11:25:c4:38:95",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
index 7568f402862..7af362ded96 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.6",
-      "mac": null,
+      "mac": "00:11:25:c4:26:56",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.134.6",
-      "mac": null,
+      "mac": "00:11:25:c4:26:57",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
index 8e4cab60a17..5d429fccb40 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.7",
-      "mac": null,
+      "mac": "00:11:25:c4:35:76",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.134.7",
-      "mac": null,
+      "mac": "00:11:25:c4:35:77",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
index 6aded25fcec..b9128473560 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.8",
-      "mac": null,
+      "mac": "00:11:25:c4:3a:be",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.134.8",
-      "mac": null,
+      "mac": "00:11:25:c4:3a:bf",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
index 0b4116c676f..459705d4eeb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.10",
-      "mac": null,
+      "mac": "00:11:25:c4:24:04",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.134.10",
-      "mac": null,
+      "mac": "00:11:25:c4:24:05",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
index addf8b23906..603b0d45fe0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.11",
-      "mac": null,
+      "mac": "00:11:25:c4:26:8a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.134.11",
-      "mac": null,
+      "mac": "00:11:25:c4:26:8b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
index 07b9144f0fe..9a357bec43d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.7.12",
-      "mac": null,
+      "mac": "00:11:25:c4:3a:86",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.134.12",
-      "mac": null,
+      "mac": "00:11:25:c4:3a:87",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
index 83f2994e7d6..993aa35ff2b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.13",
-      "mac": null,
+      "mac": "00:11:25:c4:3b:44",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.135.13",
-      "mac": null,
+      "mac": "00:11:25:c4:3b:45",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
index a7ae6650cd6..103ed8c5f17 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.14",
-      "mac": null,
+      "mac": "00:11:25:c4:26:4c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.135.14",
-      "mac": null,
+      "mac": "00:11:25:c4:26:4d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
index f4f9372c22d..e4d87560033 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.15",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:f4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.135.15",
-      "mac": null,
+      "mac": "00:11:25:c4:4d:f5",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
index 3ca70ea9079..2de761c2218 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.16",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:28",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.135.16",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:29",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
index 837259df3e1..8b4638bba14 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.17",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:5c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.135.17",
-      "mac": null,
+      "mac": "00:11:25:c4:4e:5d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
index 25ad69a21cb..cab100edc30 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
@@ -31,7 +31,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.8.18",
-      "mac": null,
+      "mac": "00:11:25:c4:51:02",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -47,7 +47,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.24.135.18",
-      "mac": null,
+      "mac": "00:11:25:c4:51:03",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
index e7cd7781af1..c355dd8770f 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.1",
-      "mac": "00:14:4f:20:90:18",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:90:19",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:90:1a",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:90:1b",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
index 5ae20dc3ad9..c031f705443 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.10",
-      "mac": "00:14:4f:20:8d:ac",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8d:ad",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8d:b2",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8d:b3",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
index 5d9dc77252a..fbd98cc2ef2 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.11",
-      "mac": "00:14:4f:8d:13:98",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:8d:13:99",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:8d:13:9a",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:8d:13:9b",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
index 30e6a2b1db9..86ad83c27e7 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.12",
-      "mac": "00:14:4f:1f:cc:00",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:cc:01",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:cc:06",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:cc:07",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
index 91faa3c2cb2..274b527ea30 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.13",
-      "mac": "00:14:4f:20:c9:68",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:c9:69",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:c9:6a",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:c9:6b",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
index 6df63117d63..853da05135e 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.14",
-      "mac": "00:14:4f:20:c9:1c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:c9:1d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:c9:1e",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:c9:1f",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
index 2e1ef3b0b56..f42cfc03ce0 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.15",
-      "mac": "00:14:4f:20:8b:26",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8b:27",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8b:2c",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8b:2d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
index 118b807a719..32f085e3508 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.16",
-      "mac": "00:14:4f:20:a8:ea",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:a8:eb",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:a8:f0",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:a8:f1",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
index 1c2c5059cbf..036afac23b0 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.17",
-      "mac": "00:14:4f:1f:fc:24",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:fc:25",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:fc:2a",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:fc:2b",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
index f3b78c00152..32ae7dcd601 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.18",
-      "mac": "00:14:4f:20:ca:78",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:ca:79",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:ca:7e",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:ca:7f",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
index 78ec6fd113f..1ba0028dd3d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.19",
-      "mac": "00:14:4f:20:b7:5c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:b7:5d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:b7:5e",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:b7:5f",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
index 444373b913c..43318f025ee 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.2",
-      "mac": "00:14:4f:20:89:60",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:61",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:66",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:67",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
index 8b4db1e8632..53f49c84bd6 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.20",
-      "mac": "00:14:4f:20:8a:98",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8a:99",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8a:9e",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8a:9f",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
index 015525b5bbc..24bdfa7e385 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.21",
-      "mac": "00:14:4f:20:8c:00",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8c:01",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8c:06",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8c:07",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
index d48e3621096..e882616d665 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.22",
-      "mac": "00:14:4f:20:b7:28",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:b7:29",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:b7:2a",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:b7:2b",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
index 3698732817f..568d154ccce 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.23",
-      "mac": "00:14:4f:20:ac:ac",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:ac:ad",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:ac:b2",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:ac:b3",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
index db85060fe9a..823be14b6f6 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.24",
-      "mac": "00:14:4f:1f:fc:ec",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:fc:ed",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:fc:f2",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:fc:f3",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
index 28b0014c6fb..85a504431f5 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.25",
-      "mac": "00:14:4f:20:89:e4",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:e5",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:e6",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:e7",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
index edbd7cd6e46..38d8d0e9f64 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.26",
-      "mac": "00:14:4f:20:ad:f8",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:ad:f9",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:ad:fe",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:ad:ff",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
index 52737ae2c77..de680cb8b12 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.27",
-      "mac": "00:14:4f:20:c0:88",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:c0:89",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:c0:8e",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:c0:8f",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
index 45b507c7685..6fb5d108f62 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.28",
-      "mac": "00:14:4f:20:c6:f4",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:c6:f5",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:c6:fa",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:c6:fb",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
index cf2a10cf25e..e31af02a6bc 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.29",
-      "mac": "00:14:4f:20:ca:44",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:ca:45",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:ca:46",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:ca:47",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
index 601cb2f6aa1..0591b1259b1 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.3",
-      "mac": "00:14:4f:20:8d:4c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8d:4d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8d:52",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8d:53",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
index 786dd07b76b..2f9c73a6d4b 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.30",
-      "mac": "00:14:4f:1f:c3:b8",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:c3:b9",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:c3:ba",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:c3:bb",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
index d304273e16c..b29fe022552 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.31",
-      "mac": "00:14:4f:20:8d:12",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8d:13",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8d:18",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8d:19",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
index 3dbe37308d7..d3aac504033 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.32",
-      "mac": "00:14:4f:20:05:3c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:05:3d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:05:3e",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:05:3f",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
index a2c8482cc45..956b49c7a6d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.33",
-      "mac": "00:14:4f:20:ad:e0",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:ad:e1",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:ad:e6",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:ad:e7",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
index 6852091f31b..4b56ce695e0 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.34",
-      "mac": "00:14:4f:20:af:1c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:af:1d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:af:22",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:af:23",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
index f9d59a322a2..f87e4997613 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.35",
-      "mac": "00:14:4f:20:8a:8a",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8a:8b",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8a:90",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8a:91",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
index a455b17778c..0852432a552 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.36",
-      "mac": "00:14:4f:1f:ff:54",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:ff:55",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:ff:5a",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:ff:5b",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
index 7b79ea84452..9734c73dd27 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.37",
-      "mac": "00:14:4f:20:b0:5c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:b0:5d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:b0:5e",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:b0:5f",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
index 8bb1a516062..01dde4db110 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.38",
-      "mac": "00:14:4f:20:a9:74",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:a9:75",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:a9:76",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:a9:77",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
index 963047fed9b..8cd8459a22d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.39",
-      "mac": "00:14:4f:20:af:ac",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:af:ad",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:af:ae",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:af:af",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
index 79bdaf4952e..a71a79bb38f 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.4",
-      "mac": "00:14:4f:20:c5:ca",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:c5:cb",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:c5:d0",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:c5:d1",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
index cc3f56b9e57..28d931fb04b 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.40",
-      "mac": "00:14:4f:20:bc:22",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:bc:23",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:bc:28",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:bc:29",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
index bb95e32b7ab..626073635e8 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.41",
-      "mac": "00:14:4f:1f:e7:e4",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:e7:e5",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:e7:e6",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:e7:e7",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
index e42617b13dd..18fef186069 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.42",
-      "mac": "00:14:4f:20:03:88",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:03:89",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:03:8a",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:03:8b",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
index df7ea79eda1..2545796af5c 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.43",
-      "mac": "00:14:4f:1f:ca:ba",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:ca:bb",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:ca:c0",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:ca:c1",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
index d2f7a17b050..227bb3deced 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.44",
-      "mac": "00:14:4f:20:bf:4c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:bf:4d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:bf:4e",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:bf:4f",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
index 001586d7b61..3872f6065b7 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.45",
-      "mac": "00:14:4f:20:05:80",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:05:81",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:05:86",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:05:87",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
index 06f0a842571..4458abf87d8 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.46",
-      "mac": "00:14:4f:20:8b:f4",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8b:f5",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8b:fa",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:8b:fb",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
index 60671ebaa25..618af4f3e90 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.47",
-      "mac": "00:14:4f:20:bf:c8",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:bf:c9",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:bf:ce",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:bf:cf",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
index db1f49877be..948baff93cc 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.48",
-      "mac": "00:14:4f:20:89:5e",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:5f",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:64",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:65",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
index e341bbf6618..86efe651d9a 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.49",
-      "mac": "00:14:4f:20:b5:04",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:b5:05",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:b5:0a",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:b5:0b",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
index 36f23d4d6e9..d3037d85632 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.5",
-      "mac": "00:14:4f:45:a6:9a",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:45:a6:9b",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:45:a6:9c",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:45:a6:9d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
index 63f8d11895e..158dafeea92 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.50",
-      "mac": "00:14:4f:20:88:fe",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:88:ff",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:04",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:05",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
index 813e748b5c1..6c09e8a4c00 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.51",
-      "mac": "00:14:4f:20:5f:e4",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:5f:e5",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:5f:ea",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:5f:eb",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
index b203e283760..c82e73b62a8 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.52",
-      "mac": "00:14:4f:20:64:fe",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:64:ff",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:65:04",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:65:05",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
index cf645d2ba1f..b15f4eb888d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.53",
-      "mac": "00:14:4f:1f:c8:48",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:c8:49",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:c8:66",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:c8:67",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
index f1d9c77142d..258a6035064 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.54",
-      "mac": "00:14:4f:20:5f:78",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:5f:79",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:5f:7e",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:5f:7f",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
index a7f3b2b8fd7..eebb2ad648e 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.55",
-      "mac": "00:14:4f:1f:c4:a4",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:c4:a5",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:c4:a6",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:c4:a7",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
index 9c1e643b301..1dee162b2f5 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.56",
-      "mac": "00:14:4f:20:89:2c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:2d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:32",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:33",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
index f8d312ccf9e..0dec999be13 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.6",
-      "mac": "00:14:4f:1f:bd:24",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:bd:25",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:bd:26",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:bd:27",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
index 22bd778fa0a..fba770f99bf 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.7",
-      "mac": "00:14:4f:20:89:74",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:75",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:76",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:89:77",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
index 654e6c42956..b04513f92a6 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.8",
-      "mac": "00:14:4f:20:a8:b0",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:a8:b1",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:a8:b6",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:20:a8:b7",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
index 2cfd2bad1cc..88a8ee99a5f 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.9",
-      "mac": "00:14:4f:1f:e8:80",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:e8:81",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:e8:82",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:14:4f:1f:e8:83",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
index 37498fd03ab..f3e8e2e2b34 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.1",
-      "mac": "00:16:36:91:e7:d0",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e7:d1",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
index 1374679594d..21441eb18b7 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.10",
-      "mac": "00:16:36:91:eb:d0",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:eb:d1",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
index cd351685b24..4bd530b52d9 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.11",
-      "mac": "00:16:36:91:e9:dc",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e9:dd",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
index bf12fd59c0a..61ffdacefc9 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.12",
-      "mac": "00:16:36:91:eb:60",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:eb:61",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
index bb56d10d294..d946fc782cd 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.13",
-      "mac": "00:16:36:91:e8:5c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e8:5d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
index 74b7e5c262a..b0716e0f431 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.14",
-      "mac": "00:16:36:c9:fb:e4",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:c9:fb:e5",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
index 5b1a9b63783..0b6ee4cf24f 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.15",
-      "mac": "00:16:36:c9:fb:34",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:c9:fb:35",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
index a8079b5821a..5904ec77e8e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.16",
-      "mac": "00:16:36:c9:fb:94",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:c9:fb:95",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
index 4182ee9d979..52fdcb03e5c 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.17",
-      "mac": "00:16:36:c5:8a:83",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:c5:8a:84",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
index 16adf55f92c..227ad4a4f4c 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.18",
-      "mac": "00:16:36:91:ec:14",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:ec:15",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
index b86e513526e..873533eca51 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.19",
-      "mac": "00:16:36:91:ea:c0",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:ea:c1",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
index 0369696607b..fcf22b30275 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.2",
-      "mac": "00:16:36:91:eb:84",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:eb:85",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
index 033520d4cd8..115db114c12 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.20",
-      "mac": "00:16:36:91:e9:74",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e9:75",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
index 9a1f87c048c..69abb209ed0 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.21",
-      "mac": "00:16:36:91:ec:24",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:ec:25",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
index 5729251242c..5d65de3eee7 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.22",
-      "mac": "00:16:36:91:e9:d8",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e9:d9",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
index 88f5565efae..b4103910f16 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.23",
-      "mac": "00:16:36:91:eb:1c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:eb:1d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
index 388e20219d7..d43a5bc46db 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.24",
-      "mac": "00:16:36:91:e9:ec",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e9:ed",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
index 1c59ded6357..8454235967c 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.25",
-      "mac": "00:16:36:91:eb:2c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:eb:2d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
index f8a8c6e1569..bd77e136b13 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.26",
-      "mac": "00:16:36:91:eb:d4",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:eb:d5",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
index 3604b6cfe29..1650770c262 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.27",
-      "mac": "00:16:36:91:e9:f0",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e9:f1",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
index 2cbd828b34a..8ea322309e6 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.28",
-      "mac": "00:16:36:91:e8:2c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e8:2d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
index 4e351cc057e..3bbdec755b8 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.29",
-      "mac": "00:16:36:91:e8:dc",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e8:dd",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
index 23f21701203..a961602974a 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.3",
-      "mac": "00:16:36:91:eb:24",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:eb:25",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
index 26e9555439c..0e502a02e5e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.30",
-      "mac": "00:16:36:91:ea:94",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:ea:95",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
index 5bb5da52eda..e5b65a99dd5 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.31",
-      "mac": "00:16:36:c9:f9:80",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:c9:f9:81",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
index 36fe02c9b65..1ed03a80cdd 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.32",
-      "mac": "00:16:36:91:e9:94",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e9:95",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
index b223a6e5db2..752562001d6 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.33",
-      "mac": "00:16:36:91:ea:84",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:ea:85",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
index d619e256d32..1f2a3e6de63 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.34",
-      "mac": "00:16:36:91:eb:dc",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:eb:dd",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
index 4e0587977fb..d5903091cea 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.35",
-      "mac": "00:16:36:91:ea:08",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:ea:09",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
index 39420986a7d..b8ab7a9a9cb 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.36",
-      "mac": "00:16:36:91:ea:08",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:ea:09",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
index 00c783cf65c..432113c1f18 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.37",
-      "mac": "00:16:36:91:e9:a4",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e9:a5",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
index c5a8be754e2..f2288f3c29b 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.38",
-      "mac": "00:16:36:91:e8:6c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e8:6d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
index bb6dfc67e30..6d45bc147ed 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.39",
-      "mac": "00:16:36:91:ec:20",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:ec:21",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
index 7d8f18c9ecc..463901af293 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.4",
-      "mac": "00:16:36:91:e9:d4",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e9:d5",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
index 9da71df7d2b..66a4a9ad047 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.40",
-      "mac": "00:16:36:91:eb:08",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:eb:09",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
index d60d251ca06..3e06c26cd44 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.41",
-      "mac": "00:16:36:91:ea:f8",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:ea:f9",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
index fb7e325a13d..a4695978ced 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.42",
-      "mac": "00:16:36:91:ea:90",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:ea:91",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
index 56abf46046a..2653a95a56d 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.43",
-      "mac": "00:16:36:91:ea:fc",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:ea:fd",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
index 2cbf19c5b8d..d301f8682f7 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.44",
-      "mac": "00:16:36:91:e9:18",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e9:19",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
index 04536cae16b..235da71a642 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.45",
-      "mac": "00:16:36:91:e9:58",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e9:59",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
index bbd874fbcf7..b10e1e81df0 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.46",
-      "mac": "00:16:36:91:eb:80",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:eb:81",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
index 51e07818e1f..41b05b43481 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.47",
-      "mac": "00:16:36:e9:26:c6",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:e9:26:c7",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
index c887e2908fb..622a475791f 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.48",
-      "mac": "00:16:36:91:eb:28",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:eb:29",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
index 3e812dbc00c..9af56e12969 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.49",
-      "mac": "00:16:36:c5:89:17",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:c5:89:18",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
index 7cc8ebcbcc0..199c08c3a73 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.5",
-      "mac": "00:16:36:91:e8:e8",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e8:e9",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
index 001e4b9e558..1fc58640c3b 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.50",
-      "mac": "00:16:36:91:e9:e0",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e9:e1",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
index 2c2308cbce1..fbd942fbe78 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.6",
-      "mac": "00:16:36:91:e8:70",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e8:71",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
index e27b604cd5b..eb59864502b 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.7",
-      "mac": "00:16:36:91:ea:d4",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:ea:d5",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
index d45a67ee2eb..8902d2d1c31 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.8",
-      "mac": "00:16:36:c5:8a:87",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:c5:8a:88",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
index f435669cb3d..62b3c040c79 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.9",
-      "mac": "00:16:36:91:e9:90",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:16:36:91:e9:91",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
index 31a67851f6f..03928a20865 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.101",
-      "mac": "00:26:b9:58:e6:82",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:58:e6:82",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
index 4ab826078dc..dd83aa19274 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.110",
-      "mac": "00:26:b9:3f:49:65",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:49:65",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
index 602256215a0..65c47dbe6cb 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.111",
-      "mac": "00:26:b9:3f:47:0c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:47:0c",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
index c5862867176..2dfab89ef45 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.112",
-      "mac": "00:26:b9:3f:49:5c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:49:5c",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
index e80af800734..c2152a408a5 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.113",
-      "mac": "00:26:b9:3f:4c:78",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:4c:78",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
index c1325e64dc5..48b6ed4bd5e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.114",
-      "mac": "00:26:b9:3f:4a:61",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:4a:61",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
index 5c70fa4bd79..2daf0b37d83 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.115",
-      "mac": "00:26:b9:3f:44:89",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:44:89",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
index d4d20c7acf8..181850ef5dd 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.116",
-      "mac": "00:26:b9:3f:41:0c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:41:0c",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
index 15e3360cfce..e6edfa463cf 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.117",
-      "mac": "00:26:b9:3f:47:db",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:47:db",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
index c063821fc3d..8733fa36203 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.118",
-      "mac": "00:26:b9:35:c4:83",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:35:c4:83",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
index ff37cd47b7a..0a8846f1992 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.119",
-      "mac": "00:26:b9:3f:40:67",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:40:67",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
index 27e879d2592..f9ee756aa11 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.102",
-      "mac": "00:26:b9:3f:49:38",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:49:38",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
index 16561887412..3465183a094 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.120",
-      "mac": "00:26:b9:3f:46:12",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:46:12",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
index a97333761f4..af617cda08a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.121",
-      "mac": "00:26:b9:3f:3f:fb",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:3f:fb",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
index 8370e31e53b..3d6de7da81d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.122",
-      "mac": "00:26:b9:3f:47:66",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:47:66",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
index bb274f68954..cf3d1b5b024 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.123",
-      "mac": "00:26:b9:3f:4a:dc",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:4a:dc",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
index cd98d80400c..80937631b82 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.124",
-      "mac": "00:26:b9:3f:47:b4",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:47:b4",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
index ac6941b322a..7cbfa8cb54b 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.125",
-      "mac": "00:26:b9:3f:47:a2",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:47:a2",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
index f29c23e2685..eb03153c3df 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.126",
-      "mac": "00:26:b9:3f:4b:4d",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:4b:4d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
index b03ef8f2b27..57dea573a80 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.127",
-      "mac": "00:26:b9:3f:4b:62",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:4b:62",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
index c179e36558c..185ec58dd73 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.128",
-      "mac": "00:26:b9:3f:49:56",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:49:56",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
index f5f189fbd62..4cf6ca94eec 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.129",
-      "mac": "00:26:b9:3f:47:ba",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:47:ba",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
index c37c8f431d0..4bf111279b5 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.103",
-      "mac": "00:26:b9:3f:4a:5e",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:4a:5e",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
index 1ef9acce152..b29c6032c2f 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.130",
-      "mac": "00:26:b9:3f:41:30",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:41:30",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
index 1fa2b889d97..8ab3524068e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.131",
-      "mac": "00:26:b9:3f:4b:56",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:4b:56",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
index 8fe6fc58d36..06797a9bb09 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.132",
-      "mac": "00:26:b9:3f:44:68",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:44:68",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
index 5735abfb115..8a19d2b801e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.133",
-      "mac": "00:26:b9:3f:3f:67",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:3f:67",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
index 67530e01b5e..f03a0179a99 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.134",
-      "mac": "00:26:b9:3f:49:5f",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:49:5f",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
index e5089fe6fa9..135b97b7f4a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.135",
-      "mac": "00:26:b9:3f:3f:1c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:3f:1c",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
index f65cc97cb83..0fac1435c0c 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.136",
-      "mac": "00:26:b9:3f:4a:94",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:4a:94",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
index 13d8b5e049b..d3fe6169bbd 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.137",
-      "mac": "00:26:b9:3f:4b:2c",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:4b:2c",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
index f97d1f2cb7a..a6217efc109 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.138",
-      "mac": "00:26:b9:3f:44:b3",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:44:b3",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
index 763ae636e46..b361c478b36 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.139",
-      "mac": "00:26:b9:3f:4b:2f",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:4b:2f",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
index e73fa34bee3..07998958c54 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.104",
-      "mac": "00:26:b9:3f:4a:6d",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:4a:6d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
index 2e514a36964..4fe9136ceb9 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.140",
-      "mac": "00:26:b9:3f:49:44",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:49:44",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
index 153e6446ee9..df69b064554 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.141",
-      "mac": "00:26:b9:3f:45:3a",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:45:3a",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
index b7227afd8bb..cc7466ef6c2 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.142",
-      "mac": "00:26:b9:3f:41:21",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:41:21",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
index 579be178d4a..7be9e2b832e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.143",
-      "mac": "00:26:b9:3f:3e:95",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:3e:95",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
index 5d472f0e39d..1eb08bda16f 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.144",
-      "mac": "00:26:b9:3f:45:2e",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:45:2e",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
index 9e78db10fcb..9693dee6556 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.145",
-      "mac": "00:26:b9:3f:47:7b",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:47:7b",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
index 6557c1dd306..6c11d958585 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.105",
-      "mac": "00:26:b9:3e:e8:58",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3e:e8:58",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
index 3046dd6fe58..d09c450436a 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.106",
-      "mac": "00:26:b9:3f:40:af",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:40:af",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
index b13df931756..8612f4d0cfd 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.107",
-      "mac": "00:26:b9:3f:43:a1",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:43:a1",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
index 1ea1611fa6a..9e1cb1db064 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.108",
-      "mac": "00:26:b9:3f:4a:3d",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:4a:3d",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
index a064d83d8cf..5a669976057 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.109",
-      "mac": "00:26:b9:3f:41:27",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:26:b9:3f:41:27",
+      "mac": null,
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/generators/input/bordeaux.rb b/generators/input/bordeaux.rb
index 67bb2597501..e898bb15bfb 100755
--- a/generators/input/bordeaux.rb
+++ b/generators/input/bordeaux.rb
@@ -15,7 +15,8 @@ site :bordeaux do |site_uid|
   user_support_contact "bordeaux-staff@lists.grid5000.fr"
   ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
     %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
-    %w{lenny-x64-base-2.3 lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
   
   cluster :bordeplage do |cluster_uid|
     model "Dell PowerEdge 1855"
diff --git a/generators/input/environments.rb b/generators/input/environments.rb
index b19427dd8b7..851e39286c0 100755
--- a/generators/input/environments.rb
+++ b/generators/input/environments.rb
@@ -467,15 +467,75 @@ end
 
 environment 'lenny-x64-base-2.3' do
   state "stable"
-  file({:path => "/grid5000/images/lenny-x64-base-2.3.tgz", :md5 => "ae5a1ab50f5654c47ddfb2d5ee2ed978"})
+  file({:path => "/grid5000/images/lenny-x64-base-2.3.tgz", :md5 => "3c255364f601fc19271783269ef541c2"})
   kernel "2.6.26.2"
-  valid_on "griffon , grelon , sagittaire , capricorne , netgdx , gdx , bordeplage , bordereau , parapide , paramount , paraquad , paradent , azur , helios , sol , suno , edel , genepi , adonis , chuque , chinqchint , chicon , chti"
+  valid_on "bordeplage , bordereau ,  adonis , edel , genepi , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno"
   based_on "Debian version lenny for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
-  accounts [{:login => "root", :password => "grid5000"}, {:login => "g5k", :password => "grid5000"}]
+  accounts [{:login => "root", :password => "grid5000"}]
+  applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
+  x11_forwarding true
+  max_open_files 8192
+  tcp_bandwidth 1.G
+end
+
+environment 'lenny-x64-big-2.3' do
+  state "stable"
+  file({:path => "/grid5000/images/lenny-x64-big-2.3.tgz", :md5 => "e5870c72c1a5386c287935dcf39a8a23"})
+  kernel "2.6.26.2"
+  valid_on "bordeplage , bordereau ,  adonis , edel , genepi , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno"
+  based_on "Debian version lenny for amd64"
+  consoles [{:port => "ttyS0", :bps => 34800}]
+  services []
+  accounts [{:login => "root", :password => "grid5000"}]
+  applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
+  x11_forwarding true
+  max_open_files 8192
+  tcp_bandwidth 1.G
+end
+
+environment 'lenny-x64-min-0.8' do
+  state "stable"
+  file({:path => "/grid5000/images/lenny-x64-min-0.8.tgz", :md5 => "a39dcad30821b7404d8eb5ac1388f650"})
+  kernel "2.6.26.2"
+  valid_on "bordeplage , bordereau ,  adonis , edel , genepi , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno"
+  based_on "Debian version lenny for amd64"
+  consoles [{:port => "ttyS0", :bps => 34800}]
+  services []
+  accounts [{:login => "root", :password => "grid5000"}]
+  applications "Vim, nano, Perl".split(", ")
+  x11_forwarding true
+  tcp_bandwidth 1.G
+end
+
+environment 'lenny-x64-nfs-2.3' do
+  state "stable"
+  file({:path => "/grid5000/images/lenny-x64-nfs-2.3.tgz", :md5 => "12522a436a2790df866f1ecd63680eff"})
+  kernel "2.6.26.2"
+  valid_on "bordeplage , bordereau ,  adonis , edel , genepi , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno"
+  based_on "Debian version lenny for amd64"
+  consoles [{:port => "ttyS0", :bps => 34800}]
+  services []
+  accounts [{:login => "root", :password => "grid5000"}]
   applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
   x11_forwarding true
   max_open_files 8192
   tcp_bandwidth 1.G
 end
+
+environment 'lenny-x64-xen-2.3' do
+  state "stable"
+  file({:path => "/grid5000/images/lenny-x64-xen-2.3.tgz", :md5 => "8e4f0eff055c61ed8a51265c1c9afd58"})
+  kernel "2.6.26.2"
+  valid_on "bordeplage , bordereau ,  adonis , edel , genepi , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno"
+  based_on "Debian version lenny for amd64"
+  consoles [{:port => "ttyS0", :bps => 34800}]
+  services []
+  accounts [{:login => "root", :password => "grid5000"}]
+  applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
+  x11_forwarding true
+  max_open_files 8192
+  tcp_bandwidth 1.G
+end
+
diff --git a/generators/input/grenoble.rb b/generators/input/grenoble.rb
index 857b4f8fad9..cfc1e4761cb 100755
--- a/generators/input/grenoble.rb
+++ b/generators/input/grenoble.rb
@@ -11,7 +11,8 @@ site :grenoble do |site_uid|
   user_support_contact
   ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
     %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
-    %w{lenny-x64-base-2.3 lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
 
   cluster :genepi do |cluster_uid|
     model "Bull R422-E1"
diff --git a/generators/input/lille.rb b/generators/input/lille.rb
index c78fefc88b6..d081edb64b6 100755
--- a/generators/input/lille.rb
+++ b/generators/input/lille.rb
@@ -11,7 +11,7 @@ site :lille do |site_uid|
   user_support_contact
   ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
     %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-xen-1.0 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
-    %w{lenny-x64-base-2.3 lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-xen-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-xen-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
   
   cluster :chicon do |cluster_uid|
     model "IBM eServer 326m"
diff --git a/generators/input/lyon.rb b/generators/input/lyon.rb
index 843470aa49a..e9abb2c801d 100755
--- a/generators/input/lyon.rb
+++ b/generators/input/lyon.rb
@@ -11,7 +11,8 @@ site :lyon do |site_uid|
   user_support_contact
   ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
     %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
-    %w{lenny-x64-base-2.3 lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
   
   cluster :capricorne do |cluster_uid|
     model "IBM eServer 325"
diff --git a/generators/input/nancy.rb b/generators/input/nancy.rb
index 1881fa54a58..c3eb68fb386 100755
--- a/generators/input/nancy.rb
+++ b/generators/input/nancy.rb
@@ -10,7 +10,8 @@ site :nancy do |site_uid|
   user_support_contact "nancy-staff@lists.grid5000.fr"
   ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} +
     %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-xen-1.0 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
-    %w{lenny-x64-base-2.3 lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-xen-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-xen-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
   compilation_server false
 
   cluster :griffon do |cluster_uid|
diff --git a/generators/input/orsay.rb b/generators/input/orsay.rb
index 5b4df40c1b8..900ba8ad054 100755
--- a/generators/input/orsay.rb
+++ b/generators/input/orsay.rb
@@ -11,7 +11,8 @@ site :orsay do |site_uid|
   user_support_contact
   ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
     %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
-    %w{lenny-x64-base-2.3 lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
 
   cluster :netgdx do |cluster_uid|
     model "IBM eServer 326m"
@@ -155,7 +156,7 @@ site :orsay do |site_uid|
           },{
             :interface => 'Ethernet',
             :rate => 1.G,
-            :mac => nil,
+            :mac => lookup('orsay', "#{node_uid}", 'mac_eth0'),
             :vendor => 'Broadcom',
             :version => 'NetXtreme BCM5780',
             :enabled => true,
@@ -170,7 +171,7 @@ site :orsay do |site_uid|
           },{
             :interface => 'Ethernet',
             :rate => 1.G,
-            :mac => nil,
+            :mac => lookup('orsay', "#{node_uid}", 'mac_eth1'),
             :vendor => 'Broadcom',
             :version => 'NetXtreme BCM5780',
             :enabled => true,
diff --git a/generators/input/rennes.rb b/generators/input/rennes.rb
index 302e87705c5..6b19428d3cc 100755
--- a/generators/input/rennes.rb
+++ b/generators/input/rennes.rb
@@ -11,7 +11,8 @@ site :rennes do |site_uid|
   user_support_contact "rennes-staff@lists.grid5000.fr"
   ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
     %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
-    %w{lenny-x64-base-2.3 lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
  compilation_server false
   
 end
diff --git a/generators/input/sophia.rb b/generators/input/sophia.rb
index c41f913194d..be83766ef2a 100755
--- a/generators/input/sophia.rb
+++ b/generators/input/sophia.rb
@@ -11,7 +11,8 @@ site :sophia do |site_uid|
   user_support_contact "sophia-staff@lists.grid5000.fr"
   ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
     %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
-    %w{lenny-x64-base-2.3 lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
   compilation_server false
     
   cluster :helios do |cluster_uid|
diff --git a/generators/input/toulouse.rb b/generators/input/toulouse.rb
index 1ea6fa72d92..ebe45b3577f 100755
--- a/generators/input/toulouse.rb
+++ b/generators/input/toulouse.rb
@@ -11,7 +11,7 @@ site :toulouse do |site_uid|
   user_support_contact
   ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
     %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1} +
-    %w{lenny-x64-base-2.3 lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
 
   cluster :violette do |cluster_uid|
     model "Sun Fire V20z"
-- 
GitLab