From d17b5a75ae9d2e46c4507cd6a9228820ac56362d Mon Sep 17 00:00:00 2001
From: Gaetan SIMO <gaetan.simo@inria.fr>
Date: Thu, 29 Sep 2011 12:14:05 +0200
Subject: [PATCH] [orsay] adding switches golden IPs.

---
 .../sites/orsay/clusters/gdx/nodes/gdx-1.json |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-10.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-100.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-101.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-102.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-103.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-104.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-105.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-106.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-107.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-108.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-109.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-11.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-110.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-111.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-112.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-113.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-114.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-115.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-116.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-117.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-118.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-119.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-12.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-120.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-121.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-122.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-123.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-124.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-125.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-126.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-127.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-128.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-129.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-13.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-130.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-131.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-132.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-133.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-134.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-135.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-136.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-137.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-138.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-139.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-14.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-140.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-141.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-142.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-143.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-144.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-145.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-146.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-147.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-148.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-149.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-15.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-150.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-151.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-152.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-153.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-154.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-155.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-156.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-157.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-158.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-159.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-16.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-160.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-161.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-162.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-163.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-164.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-165.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-166.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-167.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-168.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-169.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-17.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-170.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-171.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-172.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-173.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-174.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-175.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-176.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-177.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-178.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-179.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-18.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-180.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-181.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-182.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-183.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-184.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-185.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-186.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-187.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-188.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-189.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-19.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-190.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-191.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-192.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-193.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-194.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-195.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-196.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-197.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-198.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-199.json     |   8 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-2.json |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-20.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-200.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-201.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-202.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-203.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-204.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-205.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-206.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-207.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-208.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-209.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-21.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-210.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-211.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-212.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-213.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-214.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-215.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-216.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-217.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-218.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-219.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-22.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-220.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-221.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-222.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-223.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-224.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-225.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-226.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-227.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-228.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-229.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-23.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-230.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-231.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-232.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-233.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-234.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-235.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-236.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-237.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-238.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-239.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-24.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-240.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-241.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-242.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-243.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-244.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-245.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-246.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-247.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-248.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-249.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-25.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-250.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-251.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-252.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-253.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-254.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-255.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-256.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-257.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-258.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-259.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-26.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-260.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-261.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-262.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-263.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-264.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-265.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-266.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-267.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-268.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-269.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-27.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-270.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-271.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-272.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-273.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-274.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-275.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-276.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-277.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-278.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-279.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-28.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-280.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-281.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-282.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-283.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-284.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-285.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-286.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-287.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-288.json     |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-289.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-29.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-290.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-291.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-292.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-293.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-294.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-295.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-296.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-297.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-298.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-299.json     |   8 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-3.json |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-30.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-300.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-301.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-302.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-303.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-304.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-305.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-306.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-307.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-308.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-309.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-31.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-310.json     |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-32.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-33.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-34.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-35.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-36.json      |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-37.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-38.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-39.json      |   8 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-4.json |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-40.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-41.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-42.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-43.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-44.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-45.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-46.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-47.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-48.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-49.json      |   8 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-5.json |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-50.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-51.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-52.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-53.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-54.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-55.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-56.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-57.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-58.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-59.json      |   8 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-6.json |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-60.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-61.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-62.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-63.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-64.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-65.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-66.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-67.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-68.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-69.json      |   8 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-7.json |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-70.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-71.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-72.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-73.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-74.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-75.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-76.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-77.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-78.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-79.json      |   8 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-8.json |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-80.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-81.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-82.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-83.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-84.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-85.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-86.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-87.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-88.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-89.json      |   8 +-
 .../sites/orsay/clusters/gdx/nodes/gdx-9.json |  10 +-
 .../orsay/clusters/gdx/nodes/gdx-90.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-91.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-92.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-93.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-94.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-95.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-96.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-97.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-98.json      |   8 +-
 .../orsay/clusters/gdx/nodes/gdx-99.json      |   8 +-
 .../orsay/clusters/netgdx/nodes/netgdx-1.json |  12 +-
 .../clusters/netgdx/nodes/netgdx-10.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-11.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-12.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-13.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-14.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-15.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-16.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-17.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-18.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-19.json      |  12 +-
 .../orsay/clusters/netgdx/nodes/netgdx-2.json |  12 +-
 .../clusters/netgdx/nodes/netgdx-20.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-21.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-22.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-23.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-24.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-25.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-26.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-27.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-28.json      |  12 +-
 .../clusters/netgdx/nodes/netgdx-29.json      |  12 +-
 .../orsay/clusters/netgdx/nodes/netgdx-3.json |  12 +-
 .../clusters/netgdx/nodes/netgdx-30.json      |  12 +-
 .../orsay/clusters/netgdx/nodes/netgdx-4.json |  12 +-
 .../orsay/clusters/netgdx/nodes/netgdx-5.json |  12 +-
 .../orsay/clusters/netgdx/nodes/netgdx-6.json |  12 +-
 .../orsay/clusters/netgdx/nodes/netgdx-7.json |  12 +-
 .../orsay/clusters/netgdx/nodes/netgdx-8.json |  12 +-
 .../orsay/clusters/netgdx/nodes/netgdx-9.json |  12 +-
 generators/input/orsay-links.yaml             |   4 +-
 ...orsay-network.yaml => orsay-switches.yaml} | 224 +++++++++---------
 generators/input/orsay.rb                     |   5 +-
 343 files changed, 1608 insertions(+), 1609 deletions(-)
 rename generators/input/{orsay-network.yaml => orsay-switches.yaml} (69%)

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 90dd21710f..a92a1db8d3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-1.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-1-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 a5dcaf40fd..b1541d6e27 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-10.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-10-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-10.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 bdbf8aece8..28a779fdcc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-100.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-100-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-100.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 4a13fe98e0..32f87f805e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-101.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-101-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-101.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 e1ced9e862..3902d4557a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-102.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-102-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-102.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 132c8eb21c..560b847c06 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-103.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-103-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-103.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 2f229713ff..8cf4290b1f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-104.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-104-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-104.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 082b1c1c75..9f47297aab 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-105.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-105-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-105.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 af12d62643..c168eb11b9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-106.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-106-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-106.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 fcbbc66457..c0fd02d107 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-107.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-107-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-107.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 2a8871aebd..a6396f14e3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-108.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-108-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-108.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 fc45ea27be..bc4cf7e0d3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-109.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-109-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-109.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 6d952c49f8..d517b86338 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-11.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-11-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-11.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 1a1150f58d..a4717715b0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-110.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-110-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-110.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 317ccf8952..fa6c718ce1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-111.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-111-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-111.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 ab8dfe29d4..15b46babbe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-112.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-112-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-112.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 b0fb141cd9..c07fb7d7fd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-113.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-113-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-113.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 dfef0cc4b2..d46c44b4ad 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-114.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-114-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-114.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 cf669191b6..45ce86b296 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-115.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-115-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-115.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 61d10464c8..99a65be140 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-116.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-116-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-116.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 88b1011bdb..7f46c5769a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-117.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-117-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-117.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 134220a912..daa3b8f720 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-118.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-118-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-118.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 6bbb545a94..f5c6ba59d0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-119.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-119-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-119.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 5d10dd5136..503a430564 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-12.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-12-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-12.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 faf6b62311..8e1abb76fd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-120.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-120-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-120.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 eb018c4aa1..74589e2ade 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-121.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-121-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-121.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 df9d80b251..fac6974111 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-122.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-122-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-122.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 0b7b7bfc1c..c21af7bf29 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-123.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-123-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-123.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 7676be2be0..f03f305d81 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-124.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-124-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-124.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 bda55178ed..082fa17ce6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-125.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-125-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-125.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 98b9eaf06b..55dfeb70a9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-126.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-126-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-126.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch07.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.107",
+      "switch_ip": "172.17.95.207",
       "switch_mac": "00:24:F9:3E:A7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 9610c16985..152845bae1 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-127.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-127-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-127.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 7aa1a044f0..efe05fe630 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-128.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-128-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-128.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 9739eaef49..cf70ea38ec 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-129.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-129-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-129.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 6e40050f51..3a598a8b1a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-13.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-13-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-13.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 4ed0fc099c..06761b6e1f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-130.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-130-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-130.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 1a7825ccd8..4f0afcc871 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-131.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-131-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-131.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 59525cc953..0d186929e9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-132.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-132-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-132.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 c7d3f98baa..10800eff0c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-133.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-133-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-133.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 a4f94a541a..8938ac30a9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-134.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-134-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-134.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 b6a8aab6e7..2afbbceb7c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-135.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-135-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-135.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 8ad03ac415..016d8689da 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-136.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-136-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-136.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 53b33eb63a..d1fcd4d44b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-137.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-137-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-137.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 5a31fec589..2f3909935b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-138.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-138-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-138.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 a13eabab76..fb6a78daf0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-139.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-139-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-139.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 2f76f49000..0aa6cdfaec 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-14.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-14-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-14.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 1109264a6a..0f7a5b1430 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-140.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-140-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-140.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 64d310e0cb..d09383be49 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-141.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-141-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-141.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 950156a761..d6309fbf50 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-142.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-142-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-142.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 2004f54fbb..b37e5f6ef3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-143.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-143-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-143.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 58eab3625a..2d49657f2b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-144.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear04.orsay.grid5000.fr",
       "switch_console": "mrv04.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.204",
+      "switch_console_ip": "172.17.95.234",
       "switch_console_mac": "00:A0:9C:00:12:E4",
-      "switch_ip": "172.26.120.154",
+      "switch_ip": "172.17.95.224",
       "switch_mac": "00:0F:B5:F5:79:2A",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-144-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-144.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch08.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.108",
+      "switch_ip": "172.17.95.208",
       "switch_mac": "00:12:00:4C:F5:C2",
       "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 df3af6503a..8bb906a7c2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-145.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-145-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-145.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 7bcc68edae..ef7de6c02d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-146.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-146-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-146.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 fe8ad1cd76..0758a93f84 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-147.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-147-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-147.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 e9eb30e039..51b3c83103 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-148.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-148-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-148.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 d71f68bd08..78102c2de5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-149.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-149-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-149.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 ac1ca1bf39..4568c6cb35 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-15.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-15-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-15.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 bfa3dd356b..06743cee6f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-150.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-150-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-150.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 6cafafca1f..6c65957273 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-151.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-151-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-151.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 3b25d7716e..a16f2905b9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-152.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-152-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-152.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 367c0e2a0e..26434217cd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-153.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-153-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-153.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 3a8bd08c9d..1301ef4d0d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-154.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-154-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-154.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 8cd9703e3b..c32dcf8ebb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-155.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-155-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-155.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 06ef5903b5..814f8372a7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-156.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-156-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-156.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 5653d513b6..62bfd8d28c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-157.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-157-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-157.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 940599207e..689bab7d21 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-158.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-158-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-158.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 68b48e3878..c24091ba13 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-159.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-159-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-159.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 e37237da86..42b4767332 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-16.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-16-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-16.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 cd194e9382..0d4aa7ddfc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-160.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-160-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-160.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 52f5b3b1c3..039b67f4dd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-161.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-161-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-161.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 6739f1e7ea..104a73a0cd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-162.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-162-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-162.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch09.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.109",
+      "switch_ip": "172.17.95.209",
       "switch_mac": "00:12:01:72:CD:42",
       "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 6a5a45ff94..8d92cf1aa5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-163.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-163-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-163.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 ca6ac68aa2..f120612f19 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-164.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-164-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-164.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 4953d91340..bbb6a67fda 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-165.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-165-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-165.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 82bc6466c5..9e10b06fd2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-166.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-166-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-166.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 e58d7e9466..24949c7898 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-167.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-167-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-167.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 de1d618acd..9789d532e9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-168.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-168-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-168.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 c63f1cbc51..71c32f4ccc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-169.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-169-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-169.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 63462fbad9..3d85ea1c92 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-17.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-17-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-17.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 d3fbac3eda..9c919770d6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-170.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-170-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-170.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 f361349f68..b7fe4a327f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-171.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-171-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-171.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 4b5f4c9506..5249a553f0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-172.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-172-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-172.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 884df772af..531787ca6b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-173.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-173-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-173.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 36da65f65f..6af1e3e843 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-174.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-174-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-174.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 3308d8d476..63030e6b94 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-175.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-175-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-175.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 a58c7f76e3..cae2993555 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-176.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-176-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-176.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 c8d9a3a8ca..466e7986fa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-177.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-177-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-177.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 a8a2395a5d..9dfa95af50 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-178.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-178-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-178.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 03da3f1daf..1607f669be 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-179.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-179-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-179.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 460f9e83bb..d87975bb13 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-18.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-18-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-18.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 c76871a7c8..6045029dcf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-180.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear05.orsay.grid5000.fr",
       "switch_console": "mrv05.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.205",
+      "switch_console_ip": "172.17.95.235",
       "switch_console_mac": "00:A0:9C:00:10:AE",
-      "switch_ip": "172.26.120.155",
+      "switch_ip": "172.17.95.225",
       "switch_mac": "00:0F:B5:FB:70:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-180-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-180.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch10.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.110",
+      "switch_ip": "172.17.95.210",
       "switch_mac": "00:12:01:5B:AF:42",
       "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 493afae575..7519f8b76b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-181.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-181-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-181.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 f062468fc4..f6af667734 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-182.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-182-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-182.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 1ca77ffe62..148a604c5a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-183.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-183-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-183.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 6fd4214eba..8c8a7e1232 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-184.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-184-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-184.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 791fd12572..e9c70035bb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-185.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-185-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-185.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 62927e4da6..59f6c1618f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-186.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-186-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-186.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 6343f09a2a..62ffb2ae27 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-187.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-187-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-187.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 1408564fad..ef8e47b7dc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-188.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-188-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-188.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 d58790d638..c3a0c8d527 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-189.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-189-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-189.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 e6e38f9087..d8aa5e8518 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-19.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-19-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-19.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 48300ab301..68acd14561 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-190.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-190-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-190.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 96c68ddb24..af28d15d26 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-191.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-191-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-191.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 728541d4f1..2f291d649f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-192.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-192-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-192.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 4060323f19..f950c4533b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-193.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-193-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-193.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 e14cc83cb1..cff88f731b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-194.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-194-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-194.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 e116a6c475..42ee94133c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-195.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-195-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-195.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 e697e7af2a..713ab39991 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-196.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-196-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-196.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 b24c66d41d..098bd112ff 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-197.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-197-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-197.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "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 344fc0d621..c063cbf5aa 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-198.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-198-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-198.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch11.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.111",
+      "switch_ip": "172.17.95.211",
       "switch_mac": "00:11:BB:17:E8: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 497929742f..d1342a30ba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-199.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-199-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-199.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 2bfac52f0f..7d5a44bdc2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-2.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-2-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 dad113697f..d16837aadc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-20.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-20-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-20.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 6eda096952..6beabf40b7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-200.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-200-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-200.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 7d95182a27..00eeec61f7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-201.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-201-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-201.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 7c24a0393f..638dc628dd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-202.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-202-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-202.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 cb8cd46b2c..2fd43fa1a7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-203.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-203-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-203.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 8ab02e5533..7ed13e6fd5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-204.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-204-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-204.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 842ef7c7b9..f16c14d0d3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-205.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-205-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-205.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 3b7ad57f7c..72c73aa4ba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-206.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-206-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-206.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 d06bdfbc50..52de1a9751 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-207.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-207-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-207.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 adc447bb77..1834ab36a5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-208.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-208-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-208.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 418e8c2158..c224a01d06 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-209.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-209-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-209.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 9c8b88eb58..1c5e163140 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-21.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-21-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-21.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 3a997d6bcb..3a0dbdcdde 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-210.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-210-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-210.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 9d0ae6dff5..f9b19290c7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-211.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-211-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-211.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 0285fa2901..dd0e0982b4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-212.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-212-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-212.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 8fdd63dfe8..cba9b8e183 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-213.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-213-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-213.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 ccb8faa122..7f9631619d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-214.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-214-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-214.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 51f89af3bd..c62ab77d1e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-215.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-215-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-215.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "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 cbbbffad5c..99afc806ab 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 @@
       "rate": 1000000000,
       "switch": "netgear08.orsay.grid5000.fr",
       "switch_console": "mrv06.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.206",
+      "switch_console_ip": "172.17.95.236",
       "switch_console_mac": "00:A0:9C:00:16:42",
-      "switch_ip": "172.26.120.158",
+      "switch_ip": "172.17.95.228",
       "switch_mac": "00:0F:B5:FC:0D:AA",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-216-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-216.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch12.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.112",
+      "switch_ip": "172.17.95.212",
       "switch_mac": "00:12:00:4C:A7:C2",
       "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 121ee522fa..9ac848ac69 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-217-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-217.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 2e1dc3d868..68a771f413 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-218-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-218.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 5f7c5aa287..4bfac4a9e4 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-219-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-219.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 fcbfd1d2f8..bbfc3a2f60 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-22.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-22-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-22.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 6362f046b3..ee44f5cae5 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-220-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-220.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 7914d5c892..c783e61914 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-221-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-221.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 d1c3e9e093..2a8591915f 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-222-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-222.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 d4242ee97e..af55a3d12d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-223.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-223-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-223.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 a593d65923..aa0932e9dc 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-224-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-224.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 c7bb8e6eab..c6cbfca8bc 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-225-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-225.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 125c241207..f9688a99ed 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-226-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-226.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 4409f4b5bc..39b8c2309a 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-227-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-227.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 2b32c07f02..d287b0f5b3 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-228-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-228.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 5fefe8cc9f..a3fcbd570c 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-229-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-229.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 12a0409633..55964673be 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-23.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-23-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-23.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 c59905e156..c219bcc8ab 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-230-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-230.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 99f7b3d2d4..37cc507860 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-231.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-231-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-231.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 4a46c59004..4a7cf011af 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-232-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-232.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 3bd42bd100..26e016fbf9 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-233-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-233.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 545d3867bf..650ad0b264 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-234-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-234.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch13.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.113",
+      "switch_ip": "172.17.95.213",
       "switch_mac": "00:12:00:44:68:42",
       "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 6b7c771749..18779fa953 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-235-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-235.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 f53cc2e8bd..fb4ee52d8f 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-236-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-236.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 36aba88a53..2e49b3a45a 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-237-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-237.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 50f9f5646e..e263274036 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-238-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-238.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 cf7f340e87..741dfb88dd 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-239-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-239.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 33e9fd9f24..e876d458e7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-24.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-24-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-24.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 3b20a4ec51..57f06fb12d 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-240-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-240.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 977025280e..080809d43a 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-241-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-241.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 2935a76618..077abb26f2 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-242-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-242.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 e79d48b647..fc0a51e204 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-243-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-243.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 7663e7c602..2686f767c8 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-244-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-244.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 743e859a08..8c9a0992da 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-245-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-245.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 b85c0c21dd..6e181be894 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-246-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-246.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 892bfbc661..aaae5557d8 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-247-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-247.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 2e61fbba09..0bbde2ccfb 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-248-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-248.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 4c5fc0c0ac..697f94b30d 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-249-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-249.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 9beec88a21..b17510b0a7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-25.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-25-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-25.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 f86efa42a5..397fe42330 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-250-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-250.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 7e60a1a372..f8ff35d0ec 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 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-251-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-251.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "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 bb4f75d600..1090624423 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-252.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear07.orsay.grid5000.fr",
       "switch_console": "mrv07.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.207",
+      "switch_console_ip": "172.17.95.237",
       "switch_console_mac": "00:A0:9C:00:25:84",
-      "switch_ip": "172.26.120.157",
+      "switch_ip": "172.17.95.227",
       "switch_mac": "00:0F:B5:FC:0D:A5",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-252-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-252.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch14.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.114",
+      "switch_ip": "172.17.95.214",
       "switch_mac": "00:24:F9:2A:0E:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 13d0d3c0dc..8d1c213053 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-253.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-253-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-253.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 8f01bac5d9..a1be867d05 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-254.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-254-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-254.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 87d7a97c99..7eaa211a56 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-255.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-255-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-255.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 418f82a82d..871e14a471 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-256.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-256-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-256.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 4364b07749..870693a49e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-257.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-257-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-257.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 3720b00477..11bbdade10 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-258.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-258-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-258.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 470dbfee8a..db8ac1fbd6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-259.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-259-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-259.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 5ff4d58f7b..ce90d14e35 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-26.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-26-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-26.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 39601a07b0..c1490dda79 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-260.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-260-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-260.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 dbc5a67b1a..9f8e69ea83 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-261.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-261-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-261.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 78ded74427..4a75124bc6 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-262.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-262-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-262.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 e44e1b6839..ceff081365 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-263.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-263-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-263.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 ab26769c96..4e93a89f0c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-264.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-264-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-264.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 d0e6af9d44..2eab9723d9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-265.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-265-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-265.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 79067d3465..901461cf2b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-266.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-266-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-266.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 c711053be8..7409ace4bc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-267.json
@@ -24,9 +24,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-267-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-267.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 1a4927b7b0..e2fcc1b104 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-268.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-268-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-268.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 ae13c7b0a2..c0e378111e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-269.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-269-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-269.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 441b08d6b8..dcf1a02940 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-27.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-27-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-27.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 d7dd511756..a30c43090d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-270.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve06.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.156",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.226",
       "switch_mac": "00:18:FE::50:5B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-270-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-270.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve15.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.115",
+      "switch_ip": "172.17.95.215",
       "switch_mac": "00:18:FE:50:6B:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 7bdc90d862..cdb6268438 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-271.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-271-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-271.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 a4642ad2e6..10c993dafb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-272.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-272-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-272.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 5c83d35c79..9c53ab7aaf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-273.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-273-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-273.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 ad3e728b99..9a2e89f331 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-274.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-274-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-274.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 61c9e84bd3..0b25d490a0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-275.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-275-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-275.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 e756be1c08..029adb5262 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-276.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-276-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-276.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 54085d9153..35cf01974d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-277.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-277-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-277.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 51f1ee0c72..2fa77adaad 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-278.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-278-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-278.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 2862d85d1b..4c80ba221a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-279.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-279-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-279.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 bd4850cc52..f9fd53d1ac 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-28.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-28-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-28.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 797338c2e7..6872dbf35a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-280.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-280-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-280.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 f750d4ac22..08c16e8019 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-281.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-281-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-281.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 59028e0d58..f0a44c0f80 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-282.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-282-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-282.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 b218842baf..3dc29fd89c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-283.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-283-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-283.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 c14528b8c6..a4f6dc89bd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-284.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-284-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-284.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 de23dda876..9a9fa7f54a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-285.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-285-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-285.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 c36295e23b..a6fce2a2ac 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-286.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-286-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-286.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 a352271641..1de1313a0e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-287.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-287-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-287.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 609e2575db..26270ad6ac 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-288.json
@@ -23,9 +23,9 @@
       "rate": 100000000,
       "switch": "procurve09.orsay.grid5000.fr",
       "switch_console": "mrv08.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.208",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.159",
+      "switch_console_ip": "172.17.95.238",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.229",
       "switch_mac": "00:18:FE:50:B8:81",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-288-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-288.orsay.grid5000.fr",
       "rate": 100000000,
       "switch": "procurve16.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.116",
+      "switch_ip": "172.17.95.216",
       "switch_mac": "00:18:FE:50:0A:41",
       "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 a75409f511..f7a52071ca 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-289.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-289-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-289.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 34e7f510e3..4a1fdca732 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-29.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-29-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-29.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 1920e0b518..7836670903 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-290.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-290-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-290.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 66464f0c23..1b08da16a4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-291.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-291-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-291.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 0a38a464a7..424c402c76 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-292.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-292-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-292.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 dfdc964e42..5e7c1308c0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-293.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-293-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-293.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 bddd6b085c..fdd1b5c243 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-294.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-294-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-294.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 f0fba6501d..4164323e80 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-295.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-295-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-295.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 5d7e37b000..4923001d2e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-296.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-296-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-296.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 dd2da33c8f..4f5924d585 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-297.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-297-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-297.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 830fd1af6a..54f4e5bfe2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-298.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-298-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-298.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 26640e87be..5ffb7fe8dd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-299.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-299-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-299.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 20e0da38b6..73341040a0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-3.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-3-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-3.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 8fdeb0ab6a..ff9644aba8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-30.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-30-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-30.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 f311f30398..e82536f49b 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-300.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-300-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-300.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 4b5835758a..5f8e3aa6ae 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-301.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-301-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-301.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 eae99672ff..fa22ad5e24 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-302.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-302-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-302.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 246bc16e50..0aede7ea77 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-303.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-303-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-303.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 0a8405e3a1..dddd3b5f0a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-304.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-304-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-304.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 6e19d1b6f2..b90fca4b5c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-305.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-305-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-305.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "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 adbb08b2f0..5a77cd0c61 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-306.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-306-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-306.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 a396754520..a98204f8ba 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-307.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-307-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-307.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 ae926dd712..da92f6cc64 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-308.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-308-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-308.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 b40649430b..210f911e9d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-309.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-309-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-309.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 97ffea26dc..9ece50bb8e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-31.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-31-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-31.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 516afa6134..629a773f8c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-310.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
       "switch_console": "mrv09.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.209",
+      "switch_console_ip": "172.17.95.239",
       "switch_console_mac": "00:A0:9C:00:25:4A",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-310-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-310.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "procurve17.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.117",
+      "switch_ip": "172.17.95.217",
       "switch_mac": "00:17:A4:80:81:80",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 a611a8fa84..a334befb94 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-32.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-32-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-32.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 d581d2e991..0b0f08f902 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-33.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-33-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-33.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 cbd8013802..843bf6f117 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-34.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-34-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-34.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 5573a1ab9a..0e3ded97e2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-35.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-35-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-35.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 e1712aadf9..a29a78bdb7 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-36.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-36-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-36.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch02.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.102",
+      "switch_ip": "172.17.95.202",
       "switch_mac": "00:12:01:73:21:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 32043b4705..1cce945381 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-37.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-37-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-37.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 e75e91c6c2..bbbc0303a0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-38.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-38-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-38.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 3666630e09..1716e1e21f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-39.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-39-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-39.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 a5449c7c26..9a53d7626d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-4.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-4-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-4.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 6c3f4ed90a..ae93d62ef5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-40.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-40-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-40.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 4f258e2e46..f353495646 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-41.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-41-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-41.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 15108d2795..8248ca17a9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-42.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-42-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-42.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 5f70e008a0..af8500d396 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-43.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-43-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-43.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 427a020480..0d38ab2ffe 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-44.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-44-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-44.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 bf73fb9bbe..5658c9828a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-45.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-45-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-45.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 12c197e2e0..2d2dc0c8cb 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-46.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-46-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-46.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 25228f7ad7..bf23e84b54 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-47.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-47-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-47.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 f3758a9c1f..fcaace39ed 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-48.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-48-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-48.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 22f3d02966..772e9bcbb8 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-49.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-49-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-49.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 db571cb781..e43b3422ee 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-5.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-5-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-5.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 ad2d43b6c5..269dacea16 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-50.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-50-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-50.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 02d2014e13..62376f45b5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-51.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-51-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-51.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 167dd96e54..cbc0134f76 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-52.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-52-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-52.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 b2f740109e..ab8925d463 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-53.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-53-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-53.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 907f4e0a1d..593936d5a3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-54.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-54-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-54.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch03.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.103",
+      "switch_ip": "172.17.95.203",
       "switch_mac": "00:24:F9:3E:81:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 3596cda7e8..4d8702f17f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-55.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-55-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-55.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 5526fe443a..d3436e16b3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-56.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-56-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-56.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 9f99654401..872ae02301 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-57.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-57-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-57.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 fd06f11588..a217698788 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-58.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-58-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-58.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 2e536d3237..14ff202be0 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-59.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-59-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-59.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 427d5be2b7..93b7b44319 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-6.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-6-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-6.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 eadf52ae9d..29afb42a57 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-60.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-60-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-60.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 127c664f8e..d4470e75dc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-61.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-61-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-61.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 31e441c455..56846c1a4c 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-62.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-62-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-62.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 a094958df3..60d02ccd43 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-63.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-63-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-63.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 29f31c10a1..4c754b4665 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-64.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-64-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-64.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 36f6c51290..9df7c503d3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-65.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-65-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-65.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 7217865c92..c6a3180108 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-66.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-66-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-66.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 5ce55978a6..4dd9440533 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-67.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-67-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-67.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 daee86ecbf..2b028c3469 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-68.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-68-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-68.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 0d1413297c..0b74a12bbc 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-69.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-69-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-69.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 c96f78e11f..81737a319a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-7.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-7-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-7.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 3c3f543811..57ee41b4ce 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-70.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-70-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-70.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 7bec4871b5..d6aef4090a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-71.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-71-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-71.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 082d2849de..5d6e2428b5 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-72.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear02.orsay.grid5000.fr",
       "switch_console": "mrv02.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.202",
+      "switch_console_ip": "172.17.95.232",
       "switch_console_mac": "00:A0:9C:00:16:41",
-      "switch_ip": "172.26.120.152",
+      "switch_ip": "172.17.95.222",
       "switch_mac": "00:22:3F:E6:F8:CE",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-72-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-72.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch04.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.104",
+      "switch_ip": "172.17.95.204",
       "switch_mac": "00:11:BB:3E:FD:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 d61a5633a4..379148785f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-73.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-73-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-73.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 83574365b0..e29b77baec 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-74.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-74-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-74.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 a7756b7c56..dc12855ffd 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-75.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-75-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-75.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 8a59a3b55b..b71784b676 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-76.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-76-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-76.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 9c22a1067d..f88f3d7e8d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-77.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-77-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-77.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 7c24240f96..545c7bf923 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-78.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-78-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-78.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 a4cd43cbda..c6637c0043 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-79.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-79-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-79.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 e4a7a650fb..e727bae3d2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-8.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-8-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-8.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 c9b7a07980..6797441615 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-80.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-80-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-80.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 346734acd3..7fde1eb7a3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-81.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-81-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-81.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 f63831e0b0..c768fbf250 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-82.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-82-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-82.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 5f6ab9308c..0bce0d5ed9 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-83.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-83-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-83.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 1ede60d855..28fd37f73f 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-84.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-84-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-84.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 173c60392e..d9b397e2bf 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-85.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-85-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-85.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 b328d123d7..7ee383896d 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-86.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-86-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-86.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 5575dd3af7..961f8f4471 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-87.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-87-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-87.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 6338dd4f93..034929e3da 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-88.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-88-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-88.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 038f217563..24aaca36b2 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-89.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-89-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-89.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 ece40e7b83..4261ec57c3 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-9.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear01.orsay.grid5000.fr",
       "switch_console": "mrv01.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.201",
-      "switch_console_mac": "nil",
-      "switch_ip": "172.26.120.151",
+      "switch_console_ip": "172.17.95.231",
+      "switch_console_mac": null,
+      "switch_ip": "172.17.95.221",
       "switch_mac": "00:0F:B5:FC:0D:26",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-9-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-9.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch01.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.101",
+      "switch_ip": "172.17.95.201",
       "switch_mac": "00:12:01:73:27:C2",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 bf27655b48..9992ac4fb4 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-90.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-90-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-90.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch05.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.105",
+      "switch_ip": "172.17.95.205",
       "switch_mac": "00:24:F9:3E:E7:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 271d393da8..11fbd11f87 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-91.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-91-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-91.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 f534f2bade..1cf84ee867 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-92.json
@@ -23,9 +23,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "gdx-92-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -61,7 +61,7 @@
       "network_address": "gdx-92.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 091a787d66..b90c132f6a 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-93.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-93-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-93.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 bc397fa204..a3f8d3d040 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-94.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-94-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-94.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 24023adb54..fa720b2674 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-95.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-95-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-95.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 04b805f6d8..1cadb51a83 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-96.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-96-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-96.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 c4709c2051..c431c6150e 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-97.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-97-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-97.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 28e2c75266..fbcaaa7e56 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-98.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-98-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-98.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
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 2e9cb0d3b6..2768287411 100755
--- a/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
+++ b/data/grid5000/sites/orsay/clusters/gdx/nodes/gdx-99.json
@@ -24,9 +24,9 @@
       "rate": 1000000000,
       "switch": "netgear03.orsay.grid5000.fr",
       "switch_console": "mrv03.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.203",
+      "switch_console_ip": "172.17.95.233",
       "switch_console_mac": "00:A0:9C:00:12:DD",
-      "switch_ip": "172.26.120.153",
+      "switch_ip": "172.17.95.223",
       "switch_mac": "00:0F:B5:FB:70:89",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "gdx-99-myri0.orsay.grid5000.fr",
       "rate": 10000000000,
       "switch": "myri.orsay.grid5000.fr",
-      "switch_ip": "172.26.121.100",
+      "switch_ip": "172.18.95.254",
       "switch_mac": "00:60:DD:47:1E:66",
       "vendor": "Myrinet",
       "version": "10G-PCIE-8A-C"
@@ -62,7 +62,7 @@
       "network_address": "gdx-99.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "switch06.orsay.grid5000.fr",
-      "switch_ip": "172.26.120.106",
+      "switch_ip": "172.17.95.206",
       "switch_mac": "00:12:00:44:53:42",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
index 85ff128ff7..e5d368f025 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-1.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-1-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-1-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-1-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
index 90be6c337e..60d166aea8 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-10.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-10-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-10.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-10-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-10-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
index a5eac58633..f8b932e207 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-11.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-11-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-11.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-11-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-11-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
index d78dc84351..23e8d012ad 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-12.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-12-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-12.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-12-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-12-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
index b127f149fb..f603cc1ad1 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-13.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-13-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-13.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-13-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-13-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
index e2c0cd8692..087b37ccc8 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-14.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-14-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-14.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-14-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-14-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
index ae4c9446c3..3369a1fc31 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-15.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-15-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-15.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-15-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-15-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
index 8d31f7813e..b583331050 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-16.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-16-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-16.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-16-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-16-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
index 3a0c85a3b0..eae440bd01 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-17.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-17-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-17.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-17-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-17-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
index 5b047faa60..3fe85c21bb 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-18.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-18-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-18.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-18-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-18-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
index eecb0dda2a..57369d797c 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-19.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-19-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-19.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-19-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-19-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
index 6768dd55be..e278d28e71 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-2.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-2-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-2-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-2-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
index feb96d24dc..38b1f627fb 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-20.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-20-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-20.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-20-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-20-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
index f26e906e64..2f6d670b70 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-21.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-21-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-21.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-21-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-21-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
index abae48c3c8..424bf344b5 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-22.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-22-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-22.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-22-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-22-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
index 8966d61110..3671014995 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-23.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-23-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-23.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-23-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-23-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
index 61d98e1904..46527e9588 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-24.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-24-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-24.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-24-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-24-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
index 8626503b18..d3775efc42 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-25.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-25-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-25.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-25-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-25-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
index 655d355887..c4c8e4d417 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-26.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-26-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-26.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-26-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-26-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
index 17012e3e0d..5c79982bcb 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-27.json
@@ -23,10 +23,10 @@
       "network_address": "netgdx-27-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -44,7 +44,7 @@
       "network_address": "netgdx-27.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -62,7 +62,7 @@
       "network_address": "netgdx-27-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -80,7 +80,7 @@
       "network_address": "netgdx-27-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
index 1395cf95b4..0b40cdacd3 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-28.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-28-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-28.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-28-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-28-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
index 4526d687e8..5814ab335d 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-29.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-29-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-29.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-29-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-29-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
index 6a2e95e43f..06bfee0e9c 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-3.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-3-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-3.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-3-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-3-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
index 3842d34fd1..7fba7498bc 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-30.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-30-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-30.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-30-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-30-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
index 857be47389..70a0df10e4 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-4.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-4-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-4.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-4-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-4-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
index daf9523173..51895dc37b 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-5.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-5-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-5.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-5-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-5-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
index 2446f1dd0b..ecf18212d1 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-6.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-6-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-6.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-6-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-6-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
index 26e417e5c5..0b4e23d022 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-7.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-7-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-7.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-7-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-7-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
index bda2c01795..d32b2c518e 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-8.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-8-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-8.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-8-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-8-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
index 60400585dc..c1bc45080f 100755
--- a/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
+++ b/data/grid5000/sites/orsay/clusters/netgdx/nodes/netgdx-9.json
@@ -22,10 +22,10 @@
       "network_address": "netgdx-9-bmc.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "netgear10.orsay.grid5000.fr",
-      "switch_console": "mrv00.orsay.grid5000.fr",
-      "switch_console_ip": "172.26.120.200",
+      "switch_console": "mrv10.orsay.grid5000.fr",
+      "switch_console_ip": "172.17.95.240",
       "switch_console_mac": "00:A0:9C:00:12:FA",
-      "switch_ip": "172.26.120.160",
+      "switch_ip": "172.17.95.230",
       "switch_mac": "00:0F:B5:FC:0D:A8",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -43,7 +43,7 @@
       "network_address": "netgdx-9.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -61,7 +61,7 @@
       "network_address": "netgdx-9-eth1.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
@@ -79,7 +79,7 @@
       "network_address": "netgdx-9-eth2.orsay.grid5000.fr",
       "rate": 1000000000,
       "switch": "gw.orsay.grid5000.fr",
-      "switch_ip": "172.24.120.10",
+      "switch_ip": "172.16.95.254",
       "switch_mac": "00:11:5d:3d:50:00",
       "vendor": "Broadcom",
       "version": "NetXtreme BCM5780"
diff --git a/generators/input/orsay-links.yaml b/generators/input/orsay-links.yaml
index 84a7d736b1..a7178b5f84 100644
--- a/generators/input/orsay-links.yaml
+++ b/generators/input/orsay-links.yaml
@@ -13,7 +13,7 @@ switch-to-switch:
       - netgear10:
           width: 1
           nodes: "netgdx-1,30-bmc"
-      - mrv00:
+      - mrv10:
           width: 1
           nodes: "netgdx-1,30-rsa"
       - switch01: 
@@ -140,4 +140,4 @@ switch-to-switch:
             - mrv09: 
                 width: 1
                 nodes: "gdx-289,310-rsa"
-    
\ No newline at end of file
+    
diff --git a/generators/input/orsay-network.yaml b/generators/input/orsay-switches.yaml
similarity index 69%
rename from generators/input/orsay-network.yaml
rename to generators/input/orsay-switches.yaml
index e290fbe9a0..c043ec3296 100644
--- a/generators/input/orsay-network.yaml
+++ b/generators/input/orsay-switches.yaml
@@ -1,171 +1,171 @@
 --- 
-mrv01: 
-  mac: nil
+switch09: 
   rate: 1.G
-  ip: 172.26.120.201
+  mac: 00:12:01:72:CD:42
+  ip: 172.17.95.209
+netgear08: 
+  rate: 1.G
+  mac: 00:0F:B5:FC:0D:AA
+  ip: 172.17.95.228
 procurve09: 
   rate-in: 100.M
   rate-out: 1.G
   mac: 00:18:FE:50:B8:81
-  ip: 172.26.120.159
-netgear08: 
-  mac: 00:0F:B5:FC:0D:AA
-  rate: 1.G
-  ip: 172.26.120.158
-switch09: 
-  mac: 00:12:01:72:CD:42
-  rate: 1.G
-  ip: 172.26.120.109
-mrv02: 
-  mac: 00:A0:9C:00:16:41
+  ip: 172.17.95.229
+mrv01: 
   rate: 1.G
-  ip: 172.26.120.202
+  mac: 
+  ip: 172.17.95.231
 switch10: 
-  mac: 00:12:01:5B:AF:42
   rate: 1.G
-  ip: 172.26.120.110
-mrv03: 
-  mac: 00:A0:9C:00:12:DD
-  rate: 1.G
-  ip: 172.26.120.203
-netgear10: 
-  mac: 00:0F:B5:FC:0D:A8
+  mac: 00:12:01:5B:AF:42
+  ip: 172.17.95.210
+mrv02: 
   rate: 1.G
-  ip: 172.26.120.160
+  mac: 00:A0:9C:00:16:41
+  ip: 172.17.95.232
 switch11: 
-  mac: 00:11:BB:17:E8:C2
   rate: 1.G
-  ip: 172.26.120.111
-myri: 
-  mac: 00:60:DD:47:1E:66
-  rate: 10.G
-  ip: 172.26.121.100
-mrv04: 
-  mac: 00:A0:9C:00:12:E4
+  mac: 00:11:BB:17:E8:C2
+  ip: 172.17.95.211
+netgear10: 
   rate: 1.G
-  ip: 172.26.120.204
-switch12: 
-  mac: 00:12:00:4C:A7:C2
+  mac: 00:0F:B5:FC:0D:A8
+  ip: 172.17.95.230
+mrv03: 
   rate: 1.G
-  ip: 172.26.120.112
+  mac: 00:A0:9C:00:12:DD
+  ip: 172.17.95.233
 switch01: 
   rate-in: 1.G
   rate-out: 1.G
   mac: 00:12:01:73:27:C2
-  ip: 172.26.120.101
-mrv05: 
-  mac: 00:A0:9C:00:10:AE
-  rate: 1.G
-  ip: 172.26.120.205
-netgear01: 
-  mac: 00:0F:B5:FC:0D:26
-  rate: 1.G
-  ip: 172.26.120.151
-switch13: 
-  mac: 00:12:00:44:68:42
+  ip: 172.17.95.201
+switch12: 
   rate: 1.G
-  ip: 172.26.120.113
-switch02: 
-  mac: 00:12:01:73:21:C2
+  mac: 00:12:00:4C:A7:C2
+  ip: 172.17.95.212
+mrv04: 
   rate: 1.G
-  ip: 172.26.120.102
+  mac: 00:A0:9C:00:12:E4
+  ip: 172.17.95.234
+myri: 
+  rate: 10.G
+  mac: 00:60:DD:47:1E:66
+  ip: 172.18.95.254
 switch-nil: 
   rate-in: "0"
   rate-out: "0"
   mac: nil
   ip: nil
-cisco: 
-  mac: 00:11:5D:3D:50:00
-  ip: 172.26.120.100
-gw: 
-  mac: 00:11:5d:3d:50:00
+switch02: 
   rate: 1.G
-  ip: 172.24.120.10
-mrv06: 
-  mac: 00:A0:9C:00:16:42
+  mac: 00:12:01:73:21:C2
+  ip: 172.17.95.202
+switch13: 
   rate: 1.G
-  ip: 172.26.120.206
-netgear02: 
-  mac: 00:22:3F:E6:F8:CE
+  mac: 00:12:00:44:68:42
+  ip: 172.17.95.213
+netgear01: 
   rate: 1.G
-  ip: 172.26.120.152
-switch14: 
-  mac: 00:24:F9:2A:0E:41
+  mac: 00:0F:B5:FC:0D:26
+  ip: 172.17.95.221
+mrv05: 
   rate: 1.G
-  ip: 172.26.120.114
+  mac: 00:A0:9C:00:10:AE
+  ip: 172.17.95.235
 switch03: 
+  rate: 1.G
   mac: 00:24:F9:3E:81:42
+  ip: 172.17.95.203
+switch14: 
   rate: 1.G
-  ip: 172.26.120.103
-mrv07: 
-  mac: 00:A0:9C:00:25:84
+  mac: 00:24:F9:2A:0E:41
+  ip: 172.17.95.214
+netgear02: 
   rate: 1.G
-  ip: 172.26.120.207
-netgear03: 
-  mac: 00:0F:B5:FB:70:89
+  mac: 00:22:3F:E6:F8:CE
+  ip: 172.17.95.222
+mrv06: 
   rate: 1.G
-  ip: 172.26.120.153
+  mac: 00:A0:9C:00:16:42
+  ip: 172.17.95.236
+gw: 
+  rate: 1.G
+  mac: 00:11:5d:3d:50:00
+  ip: 172.16.95.254
+cisco: 
+  mac: 00:11:5D:3D:50:00
+  ip: 172.17.95.254
+switch04: 
+  rate: 1.G
+  mac: 00:11:BB:3E:FD:C2
+  ip: 172.17.95.204
 procurve15: 
   rate-in: 100.M
   rate-out: 1.G
   mac: 00:18:FE:50:6B:41
-  ip: 172.26.120.115
-switch04: 
-  mac: 00:11:BB:3E:FD:C2
+  ip: 172.17.95.215
+netgear03: 
   rate: 1.G
-  ip: 172.26.120.104
-mrv08: 
-  mac: nil
+  mac: 00:0F:B5:FB:70:89
+  ip: 172.17.95.223
+mrv07: 
   rate: 1.G
-  ip: 172.26.120.208
-netgear04: 
-  mac: 00:0F:B5:F5:79:2A
+  mac: 00:A0:9C:00:25:84
+  ip: 172.17.95.237
+switch05: 
   rate: 1.G
-  ip: 172.26.120.154
+  mac: 00:24:F9:3E:E7:42
+  ip: 172.17.95.205
 procurve16: 
   rate-in: 100.M
   rate-out: 1.G
   mac: 00:18:FE:50:0A:41
-  ip: 172.26.120.116
-switch05: 
-  mac: 00:24:F9:3E:E7:42
+  ip: 172.17.95.216
+netgear04: 
   rate: 1.G
-  ip: 172.26.120.105
-mrv09: 
-  mac: 00:A0:9C:00:25:4A
+  mac: 00:0F:B5:F5:79:2A
+  ip: 172.17.95.224
+mrv08: 
   rate: 1.G
-  ip: 172.26.120.209
-procurve06: 
-  rate-in: 100.M
-  rate-out: 1.G
-  mac: 00:18:FE::50:5B:41
-  ip: 172.26.120.156
-netgear05: 
-  mac: 00:0F:B5:FB:70:A5
+  mac: 
+  ip: 172.17.95.238
+switch06: 
   rate: 1.G
-  ip: 172.26.120.155
+  mac: "00:12:00:44:53:42"
+  ip: 172.17.95.206
 procurve17: 
   rate-in: 1.G
   rate-out: 1.G
   mac: 00:17:A4:80:81:80
-  ip: 172.26.120.117
-switch06: 
-  mac: "00:12:00:44:53:42"
+  ip: 172.17.95.217
+netgear05: 
   rate: 1.G
-  ip: 172.26.120.106
-switch07: 
-  mac: 00:24:F9:3E:A7:42
+  mac: 00:0F:B5:FB:70:A5
+  ip: 172.17.95.225
+procurve06: 
+  rate-in: 100.M
+  rate-out: 1.G
+  mac: 00:18:FE::50:5B:41
+  ip: 172.17.95.226
+mrv09: 
   rate: 1.G
-  ip: 172.26.120.107
-mrv00: 
-  mac: 00:A0:9C:00:12:FA
+  mac: 00:A0:9C:00:25:4A
+  ip: 172.17.95.239
+mrv10: 
   rate: 1.G
-  ip: 172.26.120.200
-netgear07: 
-  mac: 00:0F:B5:FC:0D:A5
+  mac: 00:A0:9C:00:12:FA
+  ip: 172.17.95.240
+switch07: 
   rate: 1.G
-  ip: 172.26.120.157
+  mac: 00:24:F9:3E:A7:42
+  ip: 172.17.95.207
 switch08: 
+  rate: 1.G
   mac: 00:12:00:4C:F5:C2
+  ip: 172.17.95.208
+netgear07: 
   rate: 1.G
-  ip: 172.26.120.108
+  mac: 00:0F:B5:FC:0D:A5
+  ip: 172.17.95.227
diff --git a/generators/input/orsay.rb b/generators/input/orsay.rb
index 28d9be6e83..07243b66f5 100644
--- a/generators/input/orsay.rb
+++ b/generators/input/orsay.rb
@@ -30,8 +30,8 @@ end
 
 def update_switch(switches,iface,sw_name)
   unless switches.has_key? iface and switches[iface]["name"] == sw_name
-    sw = lookup('orsay-network',sw_name) 
-    fail "Switch '#{sw_name}' not found in 'orsay-network'" if sw.nil?
+    sw = lookup('orsay-switches',sw_name) 
+    fail "Switch '#{sw_name}' not found in 'orsay-switches'" if sw.nil?
     if sw["rate-in"].nil? 
       fail "Switch '#{sw_name}' input rate must be defined : 'rate' or 'rate-in'" if sw["rate"].nil?
       sw["rate-in"] = sw["rate"]
@@ -83,7 +83,6 @@ def fill_net_ifaces(site_uid,cluster_uid,node_uid,ifaces,switches)
   net_ifaces
 end
 
-# Site description
 site :orsay do |site_uid|
   name "Orsay"
   location "Orsay, France" 
-- 
GitLab