From 999c82402ad646055c4f1eb026e37511ff630b3c Mon Sep 17 00:00:00 2001
From: Gaetan SIMO <gaetan.simo@inria.fr>
Date: Mon, 6 Jun 2011 16:49:41 +0200
Subject: [PATCH] [orsay] Adding switche procurvexy and updating nodes
 bandwidth values.

---
 .../sites/orsay/clusters/gdx/nodes/gdx-1.json |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-10.json      |   6 +-
 .../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-109.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-11.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-110.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-111.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-112.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-113.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-114.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-115.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-116.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-117.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-118.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-119.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-12.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-120.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-121.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-122.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-123.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-124.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-125.json     |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-126.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      |   6 +-
 .../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      |   6 +-
 .../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     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-145.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-146.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-147.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-148.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-149.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-15.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-150.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-151.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-152.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-153.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-154.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-155.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-156.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-157.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-158.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-159.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-16.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-160.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-161.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-162.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-163.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-164.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-165.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-166.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-167.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-168.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-169.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-17.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-170.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-171.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-172.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-173.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-174.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-175.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-176.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-177.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-178.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-179.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-18.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-180.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-181.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-182.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-183.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-184.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-185.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-186.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-187.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-188.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-189.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-19.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-190.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-191.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-192.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-193.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-194.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-195.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-196.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-197.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-198.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-199.json     |  12 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-2.json |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-20.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-200.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-201.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-202.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-203.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-204.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-205.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-206.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-207.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-208.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-209.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-21.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-210.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-211.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-212.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-213.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-214.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-215.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-216.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-217.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-218.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-219.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-22.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-220.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-221.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-222.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-223.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-224.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-225.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-226.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-227.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-228.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-229.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-23.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-230.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-231.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-232.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-233.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-234.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-235.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-236.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-237.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-238.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-239.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-24.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-240.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-241.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-242.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-243.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-244.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-245.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-246.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-247.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-248.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-249.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-25.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-250.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-251.json     |  12 +-
 .../orsay/clusters/gdx/nodes/gdx-252.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-253.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-254.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-255.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-256.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-257.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-258.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-259.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-26.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-260.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-261.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-262.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-263.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-264.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-265.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-266.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-267.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-268.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-269.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-27.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-270.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-271.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-272.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-273.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-274.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-275.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-276.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-277.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-278.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-279.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-28.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-280.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-281.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-282.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-283.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-284.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-285.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-286.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-287.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-288.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-289.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-29.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-290.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-291.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-292.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-293.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-294.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-295.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-296.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-297.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-298.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-299.json     |  14 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-3.json |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-30.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-300.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-301.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-302.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-303.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-304.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-305.json     |  14 +-
 .../orsay/clusters/gdx/nodes/gdx-306.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-307.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-308.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-309.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-31.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-310.json     |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-32.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-33.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-34.json      |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-35.json      |   6 +-
 .../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 |   6 +-
 .../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 |   6 +-
 .../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-53.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 |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-60.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-61.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-62.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-63.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-64.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-65.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-66.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-67.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-68.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-69.json      |   4 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-7.json |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-70.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-71.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-72.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 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-8.json |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-80.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-81.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 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-9.json |   6 +-
 .../orsay/clusters/gdx/nodes/gdx-90.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-91.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-92.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-93.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-94.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-95.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-96.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-97.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-98.json      |   4 +-
 .../orsay/clusters/gdx/nodes/gdx-99.json      |   4 +-
 data/grid5000/sites/orsay/orsay.json          |  12 +-
 generators/input/orsay-network.yaml           | 205 ++++++++++++------
 312 files changed, 1250 insertions(+), 1187 deletions(-)

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 1cd4d84f78..a75da1a931 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-1-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
index 1c1edf14a7..f0aff7c5af 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-10-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
index b7b520deba..64f369f478 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-100-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
index c1258ca30f..ec36795093 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-101-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
index cce7b3d98e..79af57e862 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-102-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
index 4581d140c9..de3a37a4ef 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-103-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
index fb7b2710a2..33208ad1e4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-104-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
index 3ec2588498..c949be3c2c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-105-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
index 56ad8141a0..3d94160031 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-106-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
index b3615c3f53..d2af3d7c42 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-107-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
index b1a35eeee0..f81eff3828 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-108-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
index cd752051ed..e45192fcbd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-109-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
index 136556e3ee..2547836121 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-11-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
index 35919c716d..c8713bf2d4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-110-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
index 2ba6903657..6c3b8683af 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-111-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
index af1734dee5..7c6b465146 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-112-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
index a0b1fdf3c2..f965c3a6da 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-113-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
index 5e4852780f..e122f5cd10 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-114-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
index e4c365b225..2e0c7b78a4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-115-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
index e3d045a881..66517feddd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-116-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
index e77756b3d5..759ae7cfef 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-117-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
index 3914e2c0aa..13e3ffa1b3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-118-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
index 30c3693cf0..5f3cca4684 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-119-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
index 4b1143d039..ff63ebe41b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-12-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
index eeb71fdba0..1059a116d5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-120-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
index 5535ee8926..ac41cc3a3b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-121-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
index 3ef45265aa..318ffb481d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-122-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
index 79b84e48d2..0eb5f1064c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-123-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
index e375993fae..d8140efcb7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-124-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
index 157710c401..21f351a439 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-125-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
index a5196a18d7..7f743d4263 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-126-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
index ba1662a80e..424b62fdbe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-127-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
index a7bfb5a128..9fc54dd4f2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-128-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
index 57a53a3011..c22114800b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-129-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
index 6d02d4f9c4..6d6606a77b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-13-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
index 5e1296a42d..e410a3f941 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-130-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
index 0d257be11b..a73d1a371d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-131-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
index dd994b0100..37a9edf97e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-132-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
index 6841d3f117..7c6460aca8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-133-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
index 91b3be984d..709da780bb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-134-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
index fb24b4eeb1..1d5f652c7f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-135-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
index 2f820cec18..ba80fd18c7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-136-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
index f12148dcde..63523766ae 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-137-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
index f185c56e14..b2bf9c1dd1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-138-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
index 55aac5721c..3c1cdd831e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-139-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
index f3d402ac5a..0ccc04a954 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-14-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
index fb85d18ac4..787f556130 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-140-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
index 005e2ef36f..3870b9beb3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-141-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
index 9003535c9b..46a63562b7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-142-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
index 9775db09f6..bbb3122cff 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-143-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
index 920c11018b..3d1841f574 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-144-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
index c48de52483..3f57d4a492 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-145-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
index 132ba7ae1b..41f2ac4eda 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-146-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
index 44f354dc2d..42a16e904c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-147-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
index 590a4c1a2d..4d36f99f31 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-148-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
index e632c35d18..16acbca9cf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-149-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
index c04be2a9d9..4830bc6e0a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-15-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
index a9e7b9be5c..d6cf5dbf96 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-150-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
index a6a0b89095..a063917628 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-151-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
index 5405447518..e16e445dab 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-152-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
index 0297213c14..d3ce5e0666 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-153-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
index 86315a727a..6147176757 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-154-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
index 44021c8a65..c088874ebb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-155-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
index d1fa532d1c..3b16fa9b87 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-156-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
index 54c22240c5..d874cda2e8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-157-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
index 3bb89b6ff6..9b947ad520 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-158-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
index dc8b775d18..574d33f527 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-159-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
index faa50e6336..c287005348 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-16-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
index 25ca39764b..926f45e0d2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-160-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
index 6f278f5f15..0cc4ac4417 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-161-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_ip": "172.26.120.197",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
index 1932ceb6e6..84e7228c22 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-162-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
index f75b602152..dc5141700b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-163-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
index ac8f6a3143..640abdaf2e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-164-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
index 281b49b60f..2ddbf8d214 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-165-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
index 3a9817e4ef..63095a4f7e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-166-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
index 8b8e2c5861..bfa62c3ef3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-167-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
index e6ef895dfb..029c6e8d46 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-168-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
index 8d3f8c3b98..e23242d131 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-169-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
index e10f995dde..c0a21b9eea 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-17-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
index 62b00307e0..f106bbe92d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-170-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
index 7212054fbc..3618a0267e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-171-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
index 128b02dc99..7dc874d3f5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-172-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
index ea5b269ae7..d032724bdc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-173-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
index 1d8692bfb0..c0ced9fddf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-174-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
index 47ac8dedfa..f9f7a5dc68 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-175-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
index 86e8e6f630..b5c640da49 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-176-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
index 6308c8a0c8..9165216826 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-177-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
index 4ed349cbb7..03cd7c62d4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-178-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
index 4fb7f26e8e..a764d686bb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-179-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -61,7 +61,7 @@
       "rate": 100000000,
       "switch": "procurve18.orsay.grid5000.fr",
       "switch_ip": "172.26.120.198",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
index 7659f4490e..6d8d40ed8d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-18-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
index e00cc31004..8ca0b287c4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-180-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-180.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
index 7a04a1bb62..7db01c3060 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-181-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-181.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
index a9a825b5f5..c722e6de58 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-182-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-182.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
index 858bcdbb4a..e5243a4b22 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-183-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-183.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
index 3eef9c7345..39ab4c8b9a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-184-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-184.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
index 1467f43306..ca3093761e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-185-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-185.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
index 1e03b39397..cbd9aa351a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-186-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-186.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
index 5dc939afa5..2fc255ae88 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-187-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-187.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
index ea6070ba1e..13f29fd1fc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-188-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-188.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
index d4f3f7481a..bf9066d486 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-189-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-189.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
index 826eff6977..2038b49bf2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-19-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
index ba0030cc6c..797d9475e2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-190-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-190.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
index f0a0ddc138..abe28a25c0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-191-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-191.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
index b90754bd65..09e2760e45 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-192-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-192.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
index e16aae2416..b1b5a9bed6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-193-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-193.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
index 630883ac0e..3a7f47a95a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-194-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-194.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
index 44a6b453c6..eb89fe235d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-195-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-195.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
index 826ff3bd17..636688a696 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-196-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-196.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
index 67657f042b..c1feed81e8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-197-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-197.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch": "switch14.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.114",
+      "switch_mac": "00:11:bb:17:e8:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
index ba47209830..206bb4fe42 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-198-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-198.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
index 169bb9668f..bc86a795f4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-199-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-199.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
index 1c6cfd5a7c..0101c216e8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-2-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
index bfcf953cfa..fbd765e022 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-20-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
index 0ab4a43ba4..a97048b4e3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-200-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-200.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
index 2e22b2e7ac..150ef6ee5e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-201-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-201.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
index 92dc9ec8ab..24bcde1bfe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-202-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-202.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
index bbf16c659f..588a440986 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-203-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-203.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
index 3ecd0e5377..4e12145514 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-204-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-204.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
index f2a68b58c0..b23555faae 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-205-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-205.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
index 5d5e691d70..ca219b2f82 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-206-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-206.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
index e11ae72db5..5bae7f205f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-207-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-207.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
index ad285046ed..e3c965ea56 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-208-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-208.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
index a669307c4f..6bafb0da31 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-209-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-209.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
index 7ad8f3736c..a4c33648d1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-21-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
index 0330ba2630..904c273df3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-210-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-210.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
index 6368904a18..9aca10c1be 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-211-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-211.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
index 0a5d2bdda3..4bdec8b9f2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-212-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-212.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
index 43811ed41d..957d3f348d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-213-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-213.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
index dd03235c36..f63d0a46d1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-214-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-214.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
index 64198b7b2e..61052cc885 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.206",
       "switch_console_mac": "00:a0:9c:00:16:42",
       "switch_ip": "172.26.120.156",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-215-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-215.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
-      "switch_mac": "00:11:bb:17:e8:c2",
+      "switch": "switch15.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.115",
+      "switch_mac": "00:12:00:4c:a7:c2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
index f71c7408ec..e939c6c963 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-216.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-216-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-216.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
index b11eca5c13..5dec63d003 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-217.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-217-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-217.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
index 1b9ad5ab5d..2c60764e1a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-218.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-218-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-218.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
index 55c5dab446..876f6fac0a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-219.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-219-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-219.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
index a5c5dcb21d..2993be5a99 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-22-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
index 431e63dec1..e43d6756ae 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-220.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-220-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-220.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
index dfadf6c27a..9f43f8ab19 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-221.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-221-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-221.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
index efe03a428b..73da3e7096 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-222.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-222-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-222.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
index 6016cac53b..29cdbd07be 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-223-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-223.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
index 0b7c7b29f5..19b0b45b32 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-224.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-224-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-224.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
index 66786567c7..9ac1814d1e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-225.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-225-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-225.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
index 98ce00a6ba..3c46537fd9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-226.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-226-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-226.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
index 70d640e2e4..7e0e8b3570 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-227.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-227-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-227.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
index 31eb4d1beb..3996f98977 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-228.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-228-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-228.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
index 7d80ff6d57..4c81d54404 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-229.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-229-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-229.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
index 04d7f91129..e4cb05d3b9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-23-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
index 3e8601723d..5edf3bbb37 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-230.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-230-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-230.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
index 71abad7941..661ca0d443 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-231-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-231.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
index ac5921a08e..8fb9682d83 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-232.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-232-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-232.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
index 4de1a6e29a..e090f6b99e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-233.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-233-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-233.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch07.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.107",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
index b8af9d56cc..681fc788cf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-234.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-234-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-234.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
index 33afd28d8a..df3c4fe853 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-235.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-235-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-235.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
index f04fd20c5a..d948eb9c37 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-236.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-236-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-236.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
index 0170619ad8..751b17a6f4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-237.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-237-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-237.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
index 9be509e83e..bf7e3cc1c4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-238.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-238-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-238.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
index d65901b7bb..5b1ae84b8b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-239.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-239-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-239.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
index e8478490bd..52035dd9ac 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-24-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
index 76c303ed3b..f2f6f7fb55 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-240.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-240-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-240.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
index 2e96a704ba..51b26ebe23 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-241.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-241-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-241.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
index 6f3aec83cb..70bc5dda26 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-242.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-242-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-242.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
index 0750ac7d55..795ecb8bb1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-243.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-243-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-243.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
index 6b15f26a89..47ad49e996 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-244.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-244-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-244.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
index d0f8ec7f4a..47f2257c01 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-245.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-245-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-245.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
index 8fbc462d57..505ee1c2fc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-246.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-246-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-246.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
index 966b5b7da7..9b49aac530 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-247.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-247-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-247.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
index f8ff501b39..a885ba932f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-248.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-248-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-248.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
index 4f47404113..1c5e9ff477 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-249.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-249-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-249.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
index 82998a09f9..706fac3bb1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-25-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
index 5cd4acbd87..22d874a642 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-250.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-250-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-250.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
index b465d48371..472d66e675 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-251.json
@@ -23,9 +23,9 @@
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.207",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.157",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-251-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -59,9 +59,9 @@
       "mounted": true,
       "network_address": "gdx-251.orsay.grid5000.fr",
       "rate": 1000000000,
-      "switch": "switch04.orsay.grid5000.fr",
+      "switch": "procurve-04-07.orsay.grid5000.fr",
       "switch_ip": "172.26.120.104",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
index 01ee7a09f4..0e34233fa0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-252-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
index 7ebf810859..0ccfe50fcd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-253-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
index f16f265b68..e4fe83f40c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-254-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
index 83e2e38608..684caf6b22 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-255-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
index dd9cd42d0c..d7d17312e7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-256-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
index 60fa9c3222..0068be08a6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-257-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
index 2ce3d83c54..52817cb178 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-258-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
index 299d9bbed7..ab301c5c88 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-259-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
index 87d0e94b71..8ba08f83de 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-26-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
index a83402909b..3b4a4edeb3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-260-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
index 846528da26..21cfb4c7a2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-261-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
index 903aabccf1..b381cba39f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-262-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
index 5ccbde6c6b..eae0c1c3c0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-263-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
index 8c7ffe72d5..d6b9abd29b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-264-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
index 5ad26b4592..a77d3570a1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-265-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
index d8f0b61373..352477385e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-266-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
index a1379f485c..cc116764a5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-267-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
index b41de909ed..ffd16b38b1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-268-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
index 15ba88c45c..be61613460 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-269-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
index 34f07fdb58..19389f99ba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-27-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
index 20f120942d..8091b94ec6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-270-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
index 26a9807ccd..e009c2d900 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-271-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
index 6ab5fe2233..31389a77f8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-272-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
index a996754704..bcaf4326a2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-273-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
index 42164f172c..6a00dccefb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-274-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
index 2a2df75838..71c2ef1814 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-275-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
index 138e6dbb81..dc7e372adb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-276-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
index d37e037b67..e3b7fd05b5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-277-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
index 8336964618..a93413b58f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-278-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
index a4c4eac904..6fa634b411 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-279-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
index e57e4dcdaa..d28152013c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-28-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
index e8e5f85615..89e6ce31e7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-280-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
index 41d8ea1913..27c5defb06 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-281-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
index b53fc878e5..870f00013e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-282-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
index 23b7f21d02..004e4a6546 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-283-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
index b03361d1b6..9946c090c7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-284-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
index bb62649f74..54c4d2a6ab 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-285-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
index af964c76b3..eead004c77 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-286-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
index 5c5eff6493..9b2f0e2024 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
@@ -23,7 +23,7 @@
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.158",
       "switch_mac": "00:0f:b5:fc:0d:aa",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-287-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
index 5f43e601dd..f5bade2fe6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-288-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-288.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
index bcfe33b598..6279624cdf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-289-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-289.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
index af8a372d77..17d8f2ca59 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-29-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
index 0f454fb112..8bb1838ed7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-290-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-290.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
index 20274b6126..6eb862b163 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-291-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-291.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
index 76acc7f43c..0a5c256f86 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-292-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-292.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
index 7c2dcd9be7..4688532244 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-293-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-293.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
index d03d70263b..76aacff29c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-294-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-294.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
index ff706f7dc3..b492b1f7be 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-295-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-295.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
index 1cb1901b54..521a033169 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-296-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-296.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
index c4d98c6a4f..a4ccaddc82 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-297-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-297.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
index dff3f58c93..26e32e6d05 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-298-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-298.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
index 6753676d36..368870bbdf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-299-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-299.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
index 627e224cf6..02f70776f2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-3-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
index ca3e2e58aa..79c77c1ea7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-30-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
index cdc83e81e9..0e40f17fc1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-300-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-300.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
index 469bd32329..14ebae0ff7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-301-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-301.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
index 492f254319..2077c372eb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-302-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-302.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
index 0d8e7fb85d..aadebdb429 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-303-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-303.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
index 1a240b91c3..ad9569104e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-304-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-304.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
index 037f136f8a..55b035340d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-305-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
@@ -58,10 +58,10 @@
       "mountable": true,
       "mounted": true,
       "network_address": "gdx-305.orsay.grid5000.fr",
-      "rate": 100000000,
-      "switch": "procurve01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.181",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "rate": 1000000000,
+      "switch": "switch07.orsay.grid5000.fr",
+      "switch_ip": "172.26.120.107",
+      "switch_mac": "00:12:00:44:68:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
index b516ef7291..a92f2049aa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-306-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
index c3a991fcef..9d4ff9a5f8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-307-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
index 5b3a2980be..64af42de99 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-308-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
index 3d8381e751..771bda48f3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-309-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
index d70c10615a..b56c387277 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-31-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
index 0a9d84713e..a3fd5c346d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
@@ -25,7 +25,7 @@
       "switch_console_ip": "172.26.120.209",
       "switch_console_mac": "00:a0:9c:00:25:4a",
       "switch_ip": "172.26.120.159",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_mac": "nil",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
     },
@@ -42,8 +42,8 @@
       "network_address": "gdx-310-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
index 98eec5587a..fa7921fed4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-32-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
index 2e24a7e103..cf8fb062fd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-33-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
index 0fd7ab4849..4b878ddd02 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-34-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
index 97fa3740b1..2798d9101c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-35-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
index 281b7fbfa0..7ed2805ee0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-36-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
index 3b4df34882..5581e9ece9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-37-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
index 47c7a8b9e7..127001a651 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-38-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
index fd46622106..885e936a3f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-39-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
index 1ef31692a5..ececa24aaa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-4-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
index 0b4245afe2..9eb7c0bf93 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-40-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
index 8fedb2e1a3..81fe964e10 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-41-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
index bd0f0b32fc..b2e547c6d8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-42-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
index bd71ea6068..d5dcf8edfe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-43-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
index 4002362bf6..354f54d403 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-44-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
index 8dd81e6078..823ea91eac 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-45-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
index 0b980bfa42..a2fabd8f1f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-46-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
index 8c210df9ba..ce3e70a2f7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-47-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
index 84c42d999c..e892bf6fd0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-48-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
index 14f293d993..d1a0ef68ba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-49-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
index ebfc40f833..bd97d69838 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-5-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
index a1dba07e5d..636387ef0b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-50-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
index 4c3994d14e..54cdb55a2b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-51-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
index b89c1e0cf0..5607a2bba6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-52-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
index 26a35c6a45..6e36683ca4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-53-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
index 14f0e3649e..0323519be7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-54-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
index ecb9c95541..0ae8e9d046 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-55-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
index e02e20fa53..fa5e59ceed 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-56-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
index d868e1ff0b..22187f8a40 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-57-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
index b512140d92..d755c747ec 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-58-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
index 85674f9cdc..9c930dc9f1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-59-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
index bba097fd01..da0b41c6fc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-6-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
index a584698918..e7c11aeb12 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-60-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
index 30255238e2..d4960375e2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-61-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
index 7fb6c303b9..d73c4f7038 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-62-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
index 232409f348..2066bbd733 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-63-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
index b3fbe85770..574828e58f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-64-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
index 830c684cf6..b23165ba03 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-65-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
index ebb4c51091..827cbbb10d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-66-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
index a9f7a27c44..0359a19c4b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-67-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
index 864d28a482..bab5c81905 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-68-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
index d2b1be4132..69da6131e6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-69-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
index 149835995f..b06ec33e67 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-7-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
index b514a55f54..e0ebb78bd6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-70-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
index 8847582627..94432947e5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-71-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
index 384d7048dc..5e58578840 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-72-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
index aa8fddc3a5..4b4c55ed31 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-73-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
index 0bf2d0f1c4..10bf3393b8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-74-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
index debb63ba75..42a1f0a43c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-75-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
index ad8f4445cf..9efd4e39ea 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-76-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
index 68d8cf299c..9b0750daaa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-77-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
index d5fa1baf0e..0ec0927622 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-78-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
index d1cafe0165..0ec57197e4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-79-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
index 19deda28be..53e6dc2768 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-8-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
index 768359c90b..633145345e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-80-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
index 226fc361bc..a0d57b1993 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-81-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
index cf023382bf..c6d3038b77 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-82-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
index b2c9311ca5..9e18920bd6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-83-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
index 538c4e8998..ff43330eea 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-84-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
index 22ae6477da..f88e683053 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-85-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
index 3dd5982914..a1ace87eb4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-86-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
index cb90be1ad8..98663b9527 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-87-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
index 0e9f9d687d..dac1ac0690 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-88-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
index 12c28f8185..b77e1804dc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-89-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
index ce119973f3..4a206af3af 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
@@ -23,7 +23,7 @@
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
       "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_console_mac": "nil",
       "switch_ip": "172.26.120.151",
       "switch_mac": "00:0f:b5:fc:0d:26",
       "vendor": "Broadcom",
@@ -42,8 +42,8 @@
       "network_address": "gdx-9-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
index d47eb5af16..da3ebc6ad8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-90-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
index 3074447311..7f33594419 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-91-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
index 5ef9fd5d6a..d8e2bccda6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-92-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
index d1d8515428..c0d129672a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-93-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
index 62aa29bf16..e298ee5cda 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-94-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
index f3d8b6134f..2382c3569a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-95-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
index 0eae389522..0d1b6cd83b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-96-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
index 158a29502e..3e3a82795e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-97-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
index f9f8604ba9..829b4330bf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-98-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
index cb8adf235b..fdf9907d41 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
@@ -42,8 +42,8 @@
       "network_address": "gdx-99-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "switch-mx.orsay.grid5000.fr",
-      "switch_ip": "1.1.1.1",
-      "switch_mac": "aa:aa:aa:aa:aa:aa",
+      "switch_ip": "nil",
+      "switch_mac": "nil",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
     },
diff --git a/data/grid5000/sites/orsay/orsay.json b/data/grid5000/sites/orsay/orsay.json
index 8c1413ed67..200637b60b 100755
--- a/data/grid5000/sites/orsay/orsay.json
+++ b/data/grid5000/sites/orsay/orsay.json
@@ -1,14 +1,4 @@
 {
-  "description": "",
-  "email_contact": null,
-  "latitude": 48.7,
-  "location": "Orsay, France",
-  "longitude": 2.2,
-  "name": "Orsay",
-  "security_contact": null,
-  "sys_admin_contact": null,
   "type": "site",
-  "uid": "orsay",
-  "user_support_contact": null,
-  "web": null
+  "uid": "orsay"
 }
\ No newline at end of file
diff --git a/generators/input/orsay-network.yaml b/generators/input/orsay-network.yaml
index 25f036f399..3d3a1a7a59 100644
--- a/generators/input/orsay-network.yaml
+++ b/generators/input/orsay-network.yaml
@@ -1,243 +1,316 @@
 --- 
 switch-eth0-0:
   name: "switch11"
-  nodes: "gdx-[1,18]"
+  nodes: "gdx-[1-18]"
   rate: 1.G
   ip: 172.26.120.111
   mac: 00:12:01:73:21:C2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-1:
   name: "switch12"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[19-36]"
   rate: 1.G  
   ip: 172.26.120.112
   mac: 00:12:01:73:27:C2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-2:
   name: "switch09"
-  nodes: "gdx-[37,54]"
+  nodes: "gdx-[37-54]"
   rate: 1.G  
   ip: 172.26.120.109
   mac: 00:24:F9:3E:81:42
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-3:
   name: "switch08"
-  nodes: "gdx-[55,72]"
+  nodes: "gdx-[55-72]"
   rate: 1.G  
   ip: 172.26.120.108
   mac: 00:11:BB:3E:FD:C2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-4:
   name: "switch06"
-  nodes: "gdx-[73,90]"
+  nodes: "gdx-[73-90]"
   rate: 1.G  
   ip: 172.26.120.106
   mac: 00:24:f9:3e:e7:42
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-5:
   name: "switch05"
-  nodes: "gdx-[91,108]"
+  nodes: "gdx-[91-108]"
   rate: 1.G  
   ip: 172.26.120.105
   mac: 00:12:00:44:53:42
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-6:
   name: "switch03"
-  nodes: "gdx-[109,126]"
+  nodes: "gdx-[109-126]"
   rate: 1.G  
   ip: 172.26.120.103
   mac: 00:24:f9:3e:a7:42
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-7:
   name: "switch02"
-  nodes: "gdx-[127,144]"
+  nodes: "gdx-[127-144]"
   rate: 1.G  
   ip: 172.26.120.102
   mac: 00:12:00:4c:f5:c2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-8:
   name: "procurve17"
-  nodes: "gdx-[145,162]"
+  nodes: "gdx-[145-162]"
   rate: 100.M  
   ip: 172.26.120.197
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-9:
   name: "procurve18"
-  nodes: "gdx-[163,180]"
+  nodes: "gdx-[163-180]"
   rate: 100.M  
   ip: 172.26.120.198
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-10:
-  name: "switch15"
-  nodes: "gdx-[181,198]"
-  rate: 1.G  
-  ip: 172.26.120.115
-  mac: aa:aa:aa:aa:aa:aa
-switch-eth0-11:
   name: "switch14"
-  nodes: "gdx-[199,216]"
+  nodes: "gdx-[181-198]"
   rate: 1.G  
   ip: 172.26.120.114
   mac: 00:11:bb:17:e8:c2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
+switch-eth0-11:
+  name: "switch15"
+  nodes: "gdx-[199-216]"
+  rate: 1.G  
+  ip: 172.26.120.115
+  mac: 00:12:00:4c:a7:c2
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-12:
-  name: "switch07"
-  nodes: "gdx-[217,234]"
+  name: "procurve-04-07"
+  nodes: "gdx-[217-234]"
   rate: 1.G  
   ip: 172.26.120.107
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-13:
-  name: "switch04"
-  nodes: "gdx-[235,252]"
+  name: "procurve-04-07"
+  nodes: "gdx-[235-252]"
   rate: 1.G  
   ip: 172.26.120.104
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-14:
   name: "switch10"
-  nodes: "gdx-[253,270]"
+  nodes: "gdx-[253-270]"
   rate: 1.G  
   ip: 172.26.120.110
   mac: 00:12:01:72:cd:42
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-eth0-15:
   name: "switch16"
-  nodes: "gdx-[271,288]"
+  nodes: "gdx-[271-288]"
   rate: 1.G  
   ip: 172.26.120.116
   mac: 00:12:01:5b:af:42
+  next_switch : "switch-gw"
+  next_switch_rate : 3.G
 switch-eth0-16:
-  name: "procurve01"
-  nodes: "gdx-[289,306]"
-  rate: 100.M  
-  ip: 172.26.120.181
-  mac: aa:aa:aa:aa:aa:aa
+  name: "switch07"
+  nodes: "gdx-[289-306]"
+  rate: 1.G  
+  ip: 172.26.120.107
+  mac: 00:12:00:44:68:42
+  next_switch : "switch-gw"
+  next_switch_rate : 3.G
 switch-eth0-17:
   name: "switch13"
-  nodes: "gdx-[307,310]"
+  nodes: "gdx-[307-310]"
   rate: 1.G  
   ip: 172.26.120.113
   mac: 00:24:f9:2a:0e:41
+  next_switch : "switch-gw"
+  next_switch_rate : 2.G
 switch-bmc-0:
   name: "netgear01"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[1-36]"
   rate: 1.G  
   ip: 172.26.120.151
   mac: 00:0f:b5:fc:0d:26
+  next_switch : "switch-eth0-1"
+  next_switch_rate : 1.G
 switch-bmc-1:
   name: "netgear02"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[37-72]"
   rate: 1.G  
   ip: 172.26.120.152
   mac: 00:22:3f:e6:f8:ce
+  next_switch : "switch-eth0-3"
+  next_switch_rate : 1.G
 switch-bmc-2:
   name: "netgear03"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[73-108]"
   rate: 1.G  
   ip: 172.26.120.153
   mac: 00:0f:b5:fb:70:89
+  next_switch : "switch-eth0-5"
+  next_switch_rate : 1.G
 switch-bmc-3:
   name: "netgear04"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[109-144]"
   rate: 1.G  
   ip: 172.26.120.154
   mac: 00:0f:b5:f5:79:2a
+  next_switch : "switch-eth0-7"
+  next_switch_rate : 1.G
 switch-bmc-4:
   name: "netgear05"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[145-180]"
   rate: 1.G  
   ip: 172.26.120.155
   mac: 00:0f:b5:fb:70:a5
+  next_switch : "switch-eth0-9"
+  next_switch_rate : 1.G
 switch-bmc-5:
   name: "netgear06"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[181-216]"
   rate: 1.G  
   ip: 172.26.120.156
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-eth0-11"
+  next_switch_rate : 1.G
 switch-bmc-6:
   name: "netgear07"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[216-252]"
   rate: 1.G  
   ip: 172.26.120.157
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-eth0-13"
+  next_switch_rate : 1.G
 switch-bmc-7:
   name: "netgear08"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[253-288]"
   rate: 1.G  
   ip: 172.26.120.158
   mac: 00:0f:b5:fc:0d:aa
+  next_switch : "switch-eth0-15"
+  next_switch_rate : 1.G
 switch-bmc-8:
   name: "procurve-bmc-09"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[289-310]"
   rate: 100.M  
   ip: 172.26.120.159
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-eth0-17"
+  next_switch_rate : 1.G
 switch-bmc-netgdx:
   name: "netgearxy"
-  nodes: "netgdx-[1,30]"
+  nodes: "netgdx-[1-30]"
   rate: 1.G  
   ip: 172.26.120.150
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-gw"
+  next_switch_rate : 1.G
 switch-rsa-0:
   name: "mrv01"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[1-36]"
   rate: 1.G  
   ip: 172.26.120.201
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-eth0-1"
+  next_switch_rate : 1.G
 switch-rsa-1:
   name: "mrv02"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[37-72]"
   rate: 1.G  
   ip: 172.26.120.202
   mac: 00:a0:9c:00:16:41
+  next_switch : "switch-eth0-3"
+  next_switch_rate : 1.G
 switch-rsa-2:
   name: "mrv03"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[73-108]"
   rate: 1.G  
   ip: 172.26.120.203
   mac: 00:a0:9c:00:12:dd
+  next_switch : "switch-eth0-5"
+  next_switch_rate : 1.G
 switch-rsa-3:
   name: "mrv04"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[109-144]"
   rate: 1.G  
   ip: 172.26.120.204
   mac: 00:a0:9c:00:12:e4
+  next_switch : "switch-eth0-7"
+  next_switch_rate : 1.G
 switch-rsa-4:
   name: "mrv05"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[145-180]"
   rate: 1.G  
   ip: 172.26.120.205
   mac: 00:a0:9c:00:10:ae
+  next_switch : "switch-eth0-9"
+  next_switch_rate : 1.G
 switch-rsa-5:
   name: "mrv06"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[181-216]"
   rate: 1.G  
   ip: 172.26.120.206
   mac: 00:a0:9c:00:16:42
+  next_switch : "switch-eth0-11"
+  next_switch_rate : 1.G
 switch-rsa-6:
   name: "mrv07"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[217-252]"
   rate: 1.G  
   ip: 172.26.120.207
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-eth0-13"
+  next_switch_rate : 1.G
 switch-rsa-7:
   name: "mrv08"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[253-288]"
   rate: 1.G  
   ip: 172.26.120.208
-  mac: aa:aa:aa:aa:aa:aa
+  mac: nil
+  next_switch : "switch-eth0-15"
+  next_switch_rate : 1.G
 switch-rsa-8:
   name: "mrv09"
-  nodes: "gdx-[19,36]"
+  nodes: "gdx-[289-310]"
   rate: 1.G  
   ip: 172.26.120.209
   mac: 00:a0:9c:00:25:4a
+  next_switch : "switch-eth0-17"
+  next_switch_rate : 1.G
 switch-rsa-netgdx:
   name: "mrv00"
-  nodes: "netgdx-[1,30]"
+  nodes: "netgdx-[1-30]"
   rate: 1.G 
   ip: 172.26.120.200
-  mac: aa:aa:aa:aa:aa:aa
-  
+  mac: nil
 switch-mx:
   name: "switch-mx"
-  nodes: "gdx-[1,310]"
+  nodes: "gdx-[1-310]"
   rate: 10.G  
-  ip: 1.1.1.1
-  mac: aa:aa:aa:aa:aa:aa
+  ip: nil
+  mac: nil
 switch-gw:
   name-prod: "gw"
   name-admin: "cisco"
-  nodes: "netgdx-[1,30]"
+  nodes: "netgdx-[1-30]"
   rate: 1.G 
   ip-prod: 172.24.120.10
   mac-prod: 00:11:5d:3d:50:00
-- 
GitLab