diff --git a/data/grid5000/environments/lenny-x64-base-2.3.json b/data/grid5000/environments/lenny-x64-base-2.3.json
index d951bfac6e495464fd869705a33510fa4e1fed09..7a7924a66d3993dd92df554dccae1cabfa394925 100644
--- a/data/grid5000/environments/lenny-x64-base-2.3.json
+++ b/data/grid5000/environments/lenny-x64-base-2.3.json
@@ -35,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "lenny-x64-base-2.3",
-  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette",
   "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-big-2.3.json b/data/grid5000/environments/lenny-x64-big-2.3.json
index e39770d029953e606efde4b089e2f594c4b63b29..69ec2e0c05b9f70b23fc96589047d4d4a1fd7e00 100644
--- a/data/grid5000/environments/lenny-x64-big-2.3.json
+++ b/data/grid5000/environments/lenny-x64-big-2.3.json
@@ -35,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "lenny-x64-big-2.3",
-  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette",
   "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-min-0.8.json b/data/grid5000/environments/lenny-x64-min-0.8.json
index 5f5a7cf6e70b7cb5e8a85004143933dc6fbb84f1..797f0d79c1fe64db03188f3686969acd4c75c015 100644
--- a/data/grid5000/environments/lenny-x64-min-0.8.json
+++ b/data/grid5000/environments/lenny-x64-min-0.8.json
@@ -29,6 +29,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "lenny-x64-min-0.8",
-  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette",
   "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-nfs-2.3.json b/data/grid5000/environments/lenny-x64-nfs-2.3.json
index 4a2f61200a33a01b00190ae76323f8a5b915991d..82e295273e46e49552857e6a6548665568c1d1eb 100644
--- a/data/grid5000/environments/lenny-x64-nfs-2.3.json
+++ b/data/grid5000/environments/lenny-x64-nfs-2.3.json
@@ -35,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "lenny-x64-nfs-2.3",
-  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette",
   "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-xen-2.3.json b/data/grid5000/environments/lenny-x64-xen-2.3.json
index c1fa8b24c9130ce6c25be6aeb1984d7aa2251d80..69181c523f43dc56ee3f244a0599f6d401a5f71d 100644
--- a/data/grid5000/environments/lenny-x64-xen-2.3.json
+++ b/data/grid5000/environments/lenny-x64-xen-2.3.json
@@ -23,7 +23,7 @@
     }
   ],
   "file": {
-    "md5": "8e4f0eff055c61ed8a51265c1c9afd58",
+    "md5": "7ba173eb6b339fe0110d458d987ef10f",
     "path": "/grid5000/images/lenny-x64-xen-2.3.tgz"
   },
   "kernel": "2.6.26.2",
@@ -35,6 +35,6 @@
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "lenny-x64-xen-2.3",
-  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette",
   "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/sid-x64-base-1.0.json b/data/grid5000/environments/sid-x64-base-1.0.json
index bda57d818d49d9ac6c13b62975be48099af6c0cf..a350a862cb97a036cfb81d2dc42cb3393ebe33de 100644
--- a/data/grid5000/environments/sid-x64-base-1.0.json
+++ b/data/grid5000/environments/sid-x64-base-1.0.json
@@ -35,7 +35,7 @@
   "services": [
 
   ],
-  "state": "stable",
+  "state": "deprecated",
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-base-1.0",
diff --git a/data/grid5000/environments/sid-x64-base-1.1.json b/data/grid5000/environments/sid-x64-base-1.1.json
index 7135072f67d89f847e6ff53bc278c98cc3d01298..3a54742ab3946953846935c3ca3d0ef8579f4607 100644
--- a/data/grid5000/environments/sid-x64-base-1.1.json
+++ b/data/grid5000/environments/sid-x64-base-1.1.json
@@ -35,7 +35,7 @@
   "services": [
 
   ],
-  "state": "stable",
+  "state": "deprecated",
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-base-1.1",
diff --git a/data/grid5000/environments/sid-x64-big-1.1.json b/data/grid5000/environments/sid-x64-big-1.1.json
index dc1d3ac933b830dc34edfd1972ebb73ed5fdace6..a669ae0dcf537b7c77e35784fc29577bd23b0a75 100644
--- a/data/grid5000/environments/sid-x64-big-1.1.json
+++ b/data/grid5000/environments/sid-x64-big-1.1.json
@@ -32,7 +32,7 @@
     "ldap",
     "nfs"
   ],
-  "state": "stable",
+  "state": "deprecated",
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-big-1.1",
diff --git a/data/grid5000/environments/sid-x64-nfs-1.0.json b/data/grid5000/environments/sid-x64-nfs-1.0.json
index 5713eb5a3a4cc0120d6e9a42c6342ceda047fc9b..cf3228d686cf80ddb414ea5b1c3a5649195aa283 100644
--- a/data/grid5000/environments/sid-x64-nfs-1.0.json
+++ b/data/grid5000/environments/sid-x64-nfs-1.0.json
@@ -32,7 +32,7 @@
     "ldap",
     "nfs"
   ],
-  "state": "stable",
+  "state": "deprecated",
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-nfs-1.0",
diff --git a/data/grid5000/environments/sid-x64-nfs-1.1.json b/data/grid5000/environments/sid-x64-nfs-1.1.json
index 6466af8f67fc527ff6397de95eb2971b42d470bd..f0eca4d0eb295e3bc9c65d4dfa92f92fc0e67c7e 100644
--- a/data/grid5000/environments/sid-x64-nfs-1.1.json
+++ b/data/grid5000/environments/sid-x64-nfs-1.1.json
@@ -32,7 +32,7 @@
     "ldap",
     "nfs"
   ],
-  "state": "stable",
+  "state": "deprecated",
   "tcp_bandwidth": 1000000000,
   "type": "environment",
   "uid": "sid-x64-nfs-1.1",
diff --git a/data/grid5000/environments/squeeze-x64-base-0.8.json b/data/grid5000/environments/squeeze-x64-base-0.8.json
new file mode 100644
index 0000000000000000000000000000000000000000..7336b4d10322e4e1bc7220e583fbd4e225b69834
--- /dev/null
+++ b/data/grid5000/environments/squeeze-x64-base-0.8.json
@@ -0,0 +1,40 @@
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "XEmacs",
+    "JED",
+    "nano",
+    "JOE",
+    "Perl",
+    "Python",
+    "Ruby"
+  ],
+  "based_on": "Debian version lenny for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "105bd08ea3f3bf4888d371c9a3241ee5",
+    "path": "/grid5000/images/squeeze-x64-base-0.8.tgz"
+  },
+  "kernel": "2.6.26.2",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "squeeze-x64-base-0.8",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette",
+  "x11_forwarding": true
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/squeeze-x64-big-0.8.json b/data/grid5000/environments/squeeze-x64-big-0.8.json
new file mode 100644
index 0000000000000000000000000000000000000000..e91e3d5bb6fb1ec015016f93e877a5cfff48ac4c
--- /dev/null
+++ b/data/grid5000/environments/squeeze-x64-big-0.8.json
@@ -0,0 +1,40 @@
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "XEmacs",
+    "JED",
+    "nano",
+    "JOE",
+    "Perl",
+    "Python",
+    "Ruby"
+  ],
+  "based_on": "Debian version lenny for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "bf7dcdf526d4cda8a2d23d116e9b08fc",
+    "path": "/grid5000/images/squeeze-x64-big-0.8.tgz"
+  },
+  "kernel": "2.6.26.2",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "squeeze-x64-big-0.8",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette",
+  "x11_forwarding": true
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/lenny-x64-min-2.3.json b/data/grid5000/environments/squeeze-x64-min-0.8.json
similarity index 51%
rename from data/grid5000/environments/lenny-x64-min-2.3.json
rename to data/grid5000/environments/squeeze-x64-min-0.8.json
index 8b2ce270f54c609023d70f6722aee250f94a8abc..1dd4706e3186c141ced5a452b544e33f45124e24 100644
--- a/data/grid5000/environments/lenny-x64-min-2.3.json
+++ b/data/grid5000/environments/squeeze-x64-min-0.8.json
@@ -18,8 +18,8 @@
     }
   ],
   "file": {
-    "md5": "a39dcad30821b7404d8eb5ac1388f650",
-    "path": "/grid5000/images/lenny-x64-min-0.8.tgz"
+    "md5": "8aaaf11cb65279f0d747d2dd300fb3ce",
+    "path": "/grid5000/images/squeeze-x64-min-0.8.tgz"
   },
   "kernel": "2.6.26.2",
   "services": [
@@ -28,7 +28,7 @@
   "state": "stable",
   "tcp_bandwidth": 1000000000,
   "type": "environment",
-  "uid": "lenny-x64-min-2.3",
-  "valid_on": "bordeplage , bordereau ,  adonis , edel , genepi , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno , pastel , violette",
+  "uid": "squeeze-x64-min-0.8",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette",
   "x11_forwarding": true
 }
\ No newline at end of file
diff --git a/data/grid5000/environments/squeeze-x64-nfs-0.8.json b/data/grid5000/environments/squeeze-x64-nfs-0.8.json
new file mode 100644
index 0000000000000000000000000000000000000000..a23eacbf8b6862b941ef7df2e58a63af83364968
--- /dev/null
+++ b/data/grid5000/environments/squeeze-x64-nfs-0.8.json
@@ -0,0 +1,40 @@
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "XEmacs",
+    "JED",
+    "nano",
+    "JOE",
+    "Perl",
+    "Python",
+    "Ruby"
+  ],
+  "based_on": "Debian version lenny for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "49642989fa205b8f8e3366aaa149cf29",
+    "path": "/grid5000/images/squeeze-x64-nfs-0.8.tgz"
+  },
+  "kernel": "2.6.26.2",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "squeeze-x64-nfs-0.8",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette",
+  "x11_forwarding": true
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/squeeze-x64-nfs-2.3.json b/data/grid5000/environments/squeeze-x64-nfs-2.3.json
new file mode 100644
index 0000000000000000000000000000000000000000..5dc1e66b709f0c3335d3f8714305c4ff4715ffe3
--- /dev/null
+++ b/data/grid5000/environments/squeeze-x64-nfs-2.3.json
@@ -0,0 +1,40 @@
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "XEmacs",
+    "JED",
+    "nano",
+    "JOE",
+    "Perl",
+    "Python",
+    "Ruby"
+  ],
+  "based_on": "Debian version lenny for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "49642989fa205b8f8e3366aaa149cf29",
+    "path": "/grid5000/images/squeeze-x64-nfs-0.8.tgz"
+  },
+  "kernel": "2.6.26.2",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "squeeze-x64-nfs-2.3",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette",
+  "x11_forwarding": true
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/squeeze-x64-xen-0.8.json b/data/grid5000/environments/squeeze-x64-xen-0.8.json
new file mode 100644
index 0000000000000000000000000000000000000000..62a3fdee4361d2a65c6cf8f929335cd1ca4f5c56
--- /dev/null
+++ b/data/grid5000/environments/squeeze-x64-xen-0.8.json
@@ -0,0 +1,40 @@
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "XEmacs",
+    "JED",
+    "nano",
+    "JOE",
+    "Perl",
+    "Python",
+    "Ruby"
+  ],
+  "based_on": "Debian version lenny for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "243961b600246379b1257b57c5905c68",
+    "path": "/grid5000/images/squeeze-x64-xen-0.8.tgz"
+  },
+  "kernel": "2.6.26.2",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "squeeze-x64-xen-0.8",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette",
+  "x11_forwarding": true
+}
\ No newline at end of file
diff --git a/data/grid5000/environments/squeeze-x64-xen-2.3.json b/data/grid5000/environments/squeeze-x64-xen-2.3.json
new file mode 100644
index 0000000000000000000000000000000000000000..29e04efde9c82749f05fa6daba7bfec2fca51109
--- /dev/null
+++ b/data/grid5000/environments/squeeze-x64-xen-2.3.json
@@ -0,0 +1,40 @@
+{
+  "accounts": [
+    {
+      "login": "root",
+      "password": "grid5000"
+    }
+  ],
+  "applications": [
+    "Vim",
+    "XEmacs",
+    "JED",
+    "nano",
+    "JOE",
+    "Perl",
+    "Python",
+    "Ruby"
+  ],
+  "based_on": "Debian version lenny for amd64",
+  "consoles": [
+    {
+      "bps": 34800,
+      "port": "ttyS0"
+    }
+  ],
+  "file": {
+    "md5": "351284d43d4a3687b3198cbd1d34738f",
+    "path": "/grid5000/images/squeeze-x64-xen-0.8.tgz"
+  },
+  "kernel": "2.6.26.2",
+  "max_open_files": 8192,
+  "services": [
+
+  ],
+  "state": "stable",
+  "tcp_bandwidth": 1000000000,
+  "type": "environment",
+  "uid": "squeeze-x64-xen-2.3",
+  "valid_on": "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette",
+  "x11_forwarding": true
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.0.json b/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f5666889a1c3447952d2ef846d177297..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.1.json b/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f30ebf993ecb9f571209108b7f2465..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/sid-x64-big-1.1.json b/data/grid5000/sites/bordeaux/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4910f0ce2ee266fa0a3cbc5c8e8026..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/bordeaux/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb89fe5ad72ec71d71f854a4c794912..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/bordeaux/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0fd8594a1d48d11529ed5620ecbb420..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/bordeaux/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-0.8.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..30b0a480400b40905271d51043768003e62cde82
--- /dev/null
+++ b/data/grid5000/sites/bordeaux/environments/squeeze-x64-base-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-base-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-0.8.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..f651be05618dcb7f2b8a6e1a53624a164aef6984
--- /dev/null
+++ b/data/grid5000/sites/bordeaux/environments/squeeze-x64-big-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-big-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-0.8.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..9006de5d2a4ceeebc8b7382fe52c6825a260994f
--- /dev/null
+++ b/data/grid5000/sites/bordeaux/environments/squeeze-x64-min-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-min-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-0.8.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..5185a0bb1ddf7c35393027250bf6959b6fd4dee8
--- /dev/null
+++ b/data/grid5000/sites/bordeaux/environments/squeeze-x64-nfs-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-nfs-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-0.8.json b/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..1812b44b1faddbc83cdeade8c1b7939e9b0918ae
--- /dev/null
+++ b/data/grid5000/sites/bordeaux/environments/squeeze-x64-xen-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-xen-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
index 47ad40aaf08f8440440084a96b5504894b6a9591..bf9792dec0e55dab5c8276bf5b9fd5c5fbb06df2 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.131",
+      "ip": "172.16.18.131",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-1.grenoble.grid5000.fr",
+      "network_address": "adonis-1-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
index 1911c50938c9cc52e026d81705618a154caa3de3..36f1abce5f9a6bdddd072b2e633d29e5346e29c5 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.140",
+      "ip": "172.16.18.140",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-10.grenoble.grid5000.fr",
+      "network_address": "adonis-10-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
index d8b1b2ee8e1adaf979cdd21c74d2a58f249a0dd5..5e213f6430a630b6f555e13a5f0eb2a31e4d8648 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.141",
+      "ip": "172.16.18.141",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-11.grenoble.grid5000.fr",
+      "network_address": "adonis-11-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
index 35041fdef435272dea93f500d8f2956c49b8ef98..194aa66206051fe168172c039a27e4bb6fce89c3 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.142",
+      "ip": "172.16.18.142",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-12.grenoble.grid5000.fr",
+      "network_address": "adonis-12-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
index cf303242179a52cd052e6efc68a72248bfa05783..081d3267b07f749ea34402755985746b09fcb867 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.132",
+      "ip": "172.16.18.132",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-2.grenoble.grid5000.fr",
+      "network_address": "adonis-2-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
index 399ecbd27ceb010ea23039ce71599b5dc037394e..82c3d76e365c48a6ed692861c64326638db702b7 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.133",
+      "ip": "172.16.18.133",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-3.grenoble.grid5000.fr",
+      "network_address": "adonis-3-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
index 4db950912d8c7f2a4ae8081d01919bb10e170c36..f771604be9187ff244da976f6a224b921e0abe13 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.134",
+      "ip": "172.16.18.134",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-4.grenoble.grid5000.fr",
+      "network_address": "adonis-4-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
index beb9580b2149fee52e089bc37558178bf746b9d0..9c6ae9c9f60ca3227dd3eefd809e072e4715a8ac 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.135",
+      "ip": "172.16.18.135",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-5.grenoble.grid5000.fr",
+      "network_address": "adonis-5-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
index d4744f09501c880efc04f0932fa7049cd018c429..7d9e1071b8c290a5f58f9fce3b183d4f2e1014e2 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.136",
+      "ip": "172.16.18.136",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-6.grenoble.grid5000.fr",
+      "network_address": "adonis-6-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
index 79eb8c82ac3d5b53b47bd79beeeb40e81c06dd71..3b719cf74d830f78bd1f03f73c615ad7cf80a2f5 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.137",
+      "ip": "172.16.18.137",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-7.grenoble.grid5000.fr",
+      "network_address": "adonis-7-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
index 683474667a4f8d46f69138124d0a5d8b68367de4..9d3e64afbc48c9dba9620eb00cf8af53dda9e571 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.138",
+      "ip": "172.16.18.138",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-8.grenoble.grid5000.fr",
+      "network_address": "adonis-8-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
index ef619087adf74c09084cea1b39e2bbcbd07b9a1c..4df2f72301e64b2c507537bfdd33af8cfef8d74e 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.139",
+      "ip": "172.16.18.139",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "adonis-9.grenoble.grid5000.fr",
+      "network_address": "adonis-9-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
index 939b4e213f413a0a0e048e753d3ab5ed21ccc000..a42cf03cf76b326cc5e3c701b7bdd8acc881deb9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.51",
+      "ip": "172.16.18.51",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-1.grenoble.grid5000.fr",
+      "network_address": "edel-1-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-1"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
index f52fae55a1bced0c8dbb375f4e18d01426d41c2a..f5554aff6e37b2a32efdcd751270791b16def80e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.60",
+      "ip": "172.16.18.60",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-10.grenoble.grid5000.fr",
+      "network_address": "edel-10-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-10"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
index 4e711bef356b7e360ff7b04e8d0719f6f6537c1c..45c4895b87073845a91e378d85a1b4f4728df623 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.61",
+      "ip": "172.16.18.61",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-11.grenoble.grid5000.fr",
+      "network_address": "edel-11-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-11"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
index 09e83553be2c4cac723d276426e649f21c0d7c06..55fab92b25fe7d855f4ae86b6c67305ad2093602 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.62",
+      "ip": "172.16.18.62",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-12.grenoble.grid5000.fr",
+      "network_address": "edel-12-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-12"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
index 3159f6fd3c347e6a5a6dc4a3d2aab0b4c11f3c39..aa6fe4ea242fac43756580102c56a97bac46401d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.63",
+      "ip": "172.16.18.63",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-13.grenoble.grid5000.fr",
+      "network_address": "edel-13-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-13"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
index 18dab92a7cc090640b1818f1940577391e628c78..adde872bc7d963f17c2adaf80ec1ff28065ccd12 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.64",
+      "ip": "172.16.18.64",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-14.grenoble.grid5000.fr",
+      "network_address": "edel-14-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-14"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
index 757f4b756f48b03bfd79944f81b217664fbd4753..2d5e48e46dcf8adac0cf773bf4c5c1c1ec37b0b3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.65",
+      "ip": "172.16.18.65",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-15.grenoble.grid5000.fr",
+      "network_address": "edel-15-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-15"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
index c92d392a92ec5c380e9dd2dc94084161345c3b8d..73313fcce6e91574d11cc3b7de5ce2a444395076 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.66",
+      "ip": "172.16.18.66",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-16.grenoble.grid5000.fr",
+      "network_address": "edel-16-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-16"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
index d8d5837433012d1952381b1f79423eb5ce812bfd..f1bb81c5adeaad9958e33bfa9a0ded4bd2c01575 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.67",
+      "ip": "172.16.18.67",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-17.grenoble.grid5000.fr",
+      "network_address": "edel-17-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-17"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
index e1ef3ceec9bdd34bc204f193f88d73d5e6f3ca9e..9e6dac870caa612591365593b1b1e1f191030471 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.68",
+      "ip": "172.16.18.68",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-18.grenoble.grid5000.fr",
+      "network_address": "edel-18-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-18"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
index 041a76919d8a4ee81cdc440fc6419453ce6708d9..67fc511ff2cc71fab17002c4a57f9b115d4a14c1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.69",
+      "ip": "172.16.18.69",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-19.grenoble.grid5000.fr",
+      "network_address": "edel-19-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-19"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
index 8c712d48caacaf975c80d2f51211369acc6d67f7..c88627fe6f98da2b47b7eeaf3e244f7b559aff65 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.52",
+      "ip": "172.16.18.52",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-2.grenoble.grid5000.fr",
+      "network_address": "edel-2-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-2"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
index c7af133ed1434e708453b385a88c9e6085bbc400..7b4bc3419f8d0237043576b9c64ed7a9060f1aae 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.70",
+      "ip": "172.16.18.70",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-20.grenoble.grid5000.fr",
+      "network_address": "edel-20-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-20"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
index bdb5b28b865b754d4f34737e9eaa17ac1a34ea2f..ac344a57a35c0f0267842a564ec559cf87f49c3a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.71",
+      "ip": "172.16.18.71",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-21.grenoble.grid5000.fr",
+      "network_address": "edel-21-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-21"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
index 095bc6627e924ceab6788bfbbf4ee4b953f710d0..8e588ac08acbe718f16ba34f516033a37c24bfd4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.72",
+      "ip": "172.16.18.72",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-22.grenoble.grid5000.fr",
+      "network_address": "edel-22-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-22"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
index 17498d13ae5d3b3be10ae9e402158e049ab3f03e..a9466949bc7cb18b5e2a469b69a8b7fe63035d0b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.73",
+      "ip": "172.16.18.73",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-23.grenoble.grid5000.fr",
+      "network_address": "edel-23-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-23"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
index 14abc6ba3c2e5fd8aea74e6eff6e1d636f406148..846166209504c34d72dea60035c20761e30bf960 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.74",
+      "ip": "172.16.18.74",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-24.grenoble.grid5000.fr",
+      "network_address": "edel-24-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-24"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
index f1ea081375d901ef8e1ba7719b737296e5764359..e5006c33a1c83dc00f550260fdb9e45378d2fb8d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.75",
+      "ip": "172.16.18.75",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-25.grenoble.grid5000.fr",
+      "network_address": "edel-25-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-25"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
index 12267fdb0a5e28300e627890e526eb5d87ca1bb0..ecb613415c94df895fc9458928416d12f1071b93 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.76",
+      "ip": "172.16.18.76",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-26.grenoble.grid5000.fr",
+      "network_address": "edel-26-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-26"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
index 96cd68a018f72c2c3b48b3265fd95f52745a1be7..71299a3d9433e2827136c830db0726cf7ae8e638 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.77",
+      "ip": "172.16.18.77",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-27.grenoble.grid5000.fr",
+      "network_address": "edel-27-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-27"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
index f77fc74541c71cf9106d822e225b7c88a55a80e7..42d6b7bc84a271f61ed9f385e7e41c98cec2dad5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.78",
+      "ip": "172.16.18.78",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-28.grenoble.grid5000.fr",
+      "network_address": "edel-28-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-28"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
index a236f9c9fe842c2890c552e444e57fdc9ed24f5d..f4a8a6a4602e44251c9c64b4e503332b3f0ef6a9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.79",
+      "ip": "172.16.18.79",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-29.grenoble.grid5000.fr",
+      "network_address": "edel-29-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-29"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
index 3e02e3b819617e0e35f96b369f478cf3d7a63d06..c81c4287a22ca2fde8ccd46ad3cb7bff210a3f63 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.53",
+      "ip": "172.16.18.53",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-3.grenoble.grid5000.fr",
+      "network_address": "edel-3-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-3"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
index 6e57f6f34a547552091df071ec0ae42b265d70df..7d8b06cccd93b22f78f65a16be7a0bc0b861dee1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.80",
+      "ip": "172.16.18.80",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-30.grenoble.grid5000.fr",
+      "network_address": "edel-30-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-30"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
index 9dc7afea14632223171c48166d7b516f76ccc43d..8afb66b23a38fedf752e4b7630f909f71bcd5107 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.81",
+      "ip": "172.16.18.81",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-31.grenoble.grid5000.fr",
+      "network_address": "edel-31-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-31"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
index 78f51bce1515fccaec2618c4b0dba65fc5ff49a5..3e0fb1cb0c345c35da3c5a61c1a3b7cbcc512baf 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.82",
+      "ip": "172.16.18.82",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-32.grenoble.grid5000.fr",
+      "network_address": "edel-32-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-32"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
index c50df7e4aea297de9c0a80d8cf2dff23d63cffd2..d507d5557c2caf9395be60b704e91f53a18a0616 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.83",
+      "ip": "172.16.18.83",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-33.grenoble.grid5000.fr",
+      "network_address": "edel-33-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-33"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
index dfab0c102d1a19a70410eb9bd5df79794667efa8..028536349ab1c98abf968e9fe57053de77a10b42 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.84",
+      "ip": "172.16.18.84",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-34.grenoble.grid5000.fr",
+      "network_address": "edel-34-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-34"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
index 3389205b55fc896bf4a02856f6353317a24a5592..24903526b9c836db315d9f00f0840f9a124fa504 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.85",
+      "ip": "172.16.18.85",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-35.grenoble.grid5000.fr",
+      "network_address": "edel-35-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-35"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
index a382eda1a72566ad4b4b100c50851a3e6e9249b9..5c91a0de79bedc44895bc287cf481444c7c7c3ef 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.86",
+      "ip": "172.16.18.86",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-36.grenoble.grid5000.fr",
+      "network_address": "edel-36-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-36"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
index 01b4656a43b583b4322da9983a8bdf64d73fb068..8e68d7488b811e534f5963c6aa1b50ed5e9ade06 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.87",
+      "ip": "172.16.18.87",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-37.grenoble.grid5000.fr",
+      "network_address": "edel-37-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-37"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
index 92ae9fa337d8914af631ea5e39e5c3c49c976edf..651db6540e0118172ca1ca8b9a32c823d10af3e1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.88",
+      "ip": "172.16.18.88",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-38.grenoble.grid5000.fr",
+      "network_address": "edel-38-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-38"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
index 3159e754637a642482f270292012f957ddfddf68..53b66a692c752bc2d5ad2d7b916048a065a16280 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.89",
+      "ip": "172.16.18.89",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-39.grenoble.grid5000.fr",
+      "network_address": "edel-39-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-39"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
index 54aad2081cb6ab55dba008dc1329c9c1f3258878..796ad35f7eaf8ffa3ee51401fcf4966909c7e353 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.54",
+      "ip": "172.16.18.54",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-4.grenoble.grid5000.fr",
+      "network_address": "edel-4-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-4"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
index 9a7c5e6890a7a762660e4a5e68a5437739d7a258..426668044e514acc3d5bd0ac1a2e87671cd29902 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.90",
+      "ip": "172.16.18.90",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-40.grenoble.grid5000.fr",
+      "network_address": "edel-40-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-40"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
index e18fd8cb7b16ed026163d91327eee5b903daabb2..b2df3a24475367577d0cad76b2a32582c0427b89 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.91",
+      "ip": "172.16.18.91",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-41.grenoble.grid5000.fr",
+      "network_address": "edel-41-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-41"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
index 5b3f677ba5eec3acb5bf4b0517a1e0295f240eaf..661a6329cf28eae6584b36f71c2a95db8467d800 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.92",
+      "ip": "172.16.18.92",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-42.grenoble.grid5000.fr",
+      "network_address": "edel-42-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-42"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
index 6ee524723fc23c348c7ba3cf9c7d139d6520dc9a..a5da05fc38c89c4e1aebe4fd7478ed6060eec5df 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.93",
+      "ip": "172.16.18.93",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-43.grenoble.grid5000.fr",
+      "network_address": "edel-43-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-43"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
index 2e341c2075399dc3a44ae5ba5312c1c95bf7c124..f6d2d0610aab7543f44efc10685829ae4924895b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.94",
+      "ip": "172.16.18.94",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-44.grenoble.grid5000.fr",
+      "network_address": "edel-44-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-44"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
index 8897c018e1bbed08c1678443765246203ecc8697..c30b2a735192032d1ff6a72ea5cf954506d73f54 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.95",
+      "ip": "172.16.18.95",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-45.grenoble.grid5000.fr",
+      "network_address": "edel-45-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-45"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
index 5839524f0e879c6752c002f3a1dbcf15f8d361d8..5bfdc85d460a0b3d43bc5b66e2d99cafade38036 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.96",
+      "ip": "172.16.18.96",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-46.grenoble.grid5000.fr",
+      "network_address": "edel-46-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-46"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
index 11f14627f33bf00edcd0d3198898d9e10e3ee4a7..caaa5c30dfd67c8969550eef129b8482a34399ba 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.97",
+      "ip": "172.16.18.97",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-47.grenoble.grid5000.fr",
+      "network_address": "edel-47-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-47"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
index 1c393fb5f51d9e28c586ec13a35fefdeab22fa66..58c4504433444e1f72b079ea1fc3fa648954f68e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.98",
+      "ip": "172.16.18.98",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-48.grenoble.grid5000.fr",
+      "network_address": "edel-48-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-48"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
index 72f41130defe1bf5f9f5dfcaefa5aa0f0447244c..31a9ae3d215cd383e05961e42d0ddb249c55fcd0 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.99",
+      "ip": "172.16.18.99",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-49.grenoble.grid5000.fr",
+      "network_address": "edel-49-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-49"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
index 1dff97b9120048d101207e753f2576631e354e1e..6ca8c1188327c6f2dfceff20c30a46fd49a44938 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.55",
+      "ip": "172.16.18.55",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-5.grenoble.grid5000.fr",
+      "network_address": "edel-5-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-5"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
index b6121a3790ab7092546a04b20fa4e418412f7699..73f755be38e77d3c25c5cd8fe55b110d624ba462 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.100",
+      "ip": "172.16.18.100",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-50.grenoble.grid5000.fr",
+      "network_address": "edel-50-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-50"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
index 7dd09b6df64fb0c3f52a1904f9a24a8a67418667..65a07c072e7a937f3765b3ef6841c24ae1795c80 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.101",
+      "ip": "172.16.18.101",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-51.grenoble.grid5000.fr",
+      "network_address": "edel-51-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-51"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
index 6ddff92ff086e0b9fd9dfe7da63c2ab35470733d..0f5281119160f2ece0797b77a19b82b7d540d0e2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.102",
+      "ip": "172.16.18.102",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-52.grenoble.grid5000.fr",
+      "network_address": "edel-52-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-52"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
index eb0dbbe01bf0da0a49e1952d2ade190dd92a4c14..9c9676f3a969c48aa379830e27a60200eb1f2001 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.103",
+      "ip": "172.16.18.103",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-53.grenoble.grid5000.fr",
+      "network_address": "edel-53-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-53"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
index 4785f64d1a3747c176f06f51ccf82a5fdda0ed52..7829b8a417000cd5a4f7879e293dc224a097edb0 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.104",
+      "ip": "172.16.18.104",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-54.grenoble.grid5000.fr",
+      "network_address": "edel-54-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-54"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
index 6d25e8e8a84a441912d273d5abc9e46d91881311..3ae3a5f6eebbcad37790b3b8f27e3392a6b0aaac 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.105",
+      "ip": "172.16.18.105",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-55.grenoble.grid5000.fr",
+      "network_address": "edel-55-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-55"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
index 87990a40466e33ecd6762d2731828110a1b5ec03..4ba2166ea780d1fd4b5633cd324120713b4fa4d0 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.106",
+      "ip": "172.16.18.106",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-56.grenoble.grid5000.fr",
+      "network_address": "edel-56-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-56"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
index 674dea27e21393d560699a9082e81de5c29ffbe8..4993e793765817c2add672ce6653406249fc29db 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.107",
+      "ip": "172.16.18.107",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-57.grenoble.grid5000.fr",
+      "network_address": "edel-57-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-57"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
index 45bdfc16a75b2d26c6e6053d8c8ec45f84670397..fc7062f2f994eddb070c0fd8d4c4608c14776081 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.108",
+      "ip": "172.16.18.108",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-58.grenoble.grid5000.fr",
+      "network_address": "edel-58-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-58"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
index 35e283cdad872b98f5e152bf7bcc5c8c3f4d0df8..3a4aa17d05acc5aad0b4a45cc8475c88a46434e8 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.109",
+      "ip": "172.16.18.109",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-59.grenoble.grid5000.fr",
+      "network_address": "edel-59-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-59"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
index 97e9aa636524918d52db597c9a25ae53adba785f..330779de389f123881c2c75e53faca29e750cf3f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.56",
+      "ip": "172.16.18.56",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-6.grenoble.grid5000.fr",
+      "network_address": "edel-6-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-6"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
index 77d5b34a58346342832405dd26f0c34fca6cf8f3..21a82953c90e11d2ba6a05e60c62e38771253af7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.110",
+      "ip": "172.16.18.110",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-60.grenoble.grid5000.fr",
+      "network_address": "edel-60-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-60"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
index e6d8d7af505a66014930791917107832931046af..375155d94a994787b2c02c78edcbf4ad07947455 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.111",
+      "ip": "172.16.18.111",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-61.grenoble.grid5000.fr",
+      "network_address": "edel-61-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-61"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
index 5cdd9180e0aee748f973c4a888dc6b238a3206f8..47d5e3c149ba2019ec0fb8edc46143fd400a06de 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.112",
+      "ip": "172.16.18.112",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-62.grenoble.grid5000.fr",
+      "network_address": "edel-62-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-62"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
index 152b29024030ebde69added8a2c335185f098f59..436c3dcb2d8b544677559fc224229e7b19b6b33d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.113",
+      "ip": "172.16.18.113",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-63.grenoble.grid5000.fr",
+      "network_address": "edel-63-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-63"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
index 20dde280a51fa3d4e3ec9cee951afe483f74ea03..2da880d3d9480a0324e0aabbd854ebc43cadf467 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.114",
+      "ip": "172.16.18.114",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-64.grenoble.grid5000.fr",
+      "network_address": "edel-64-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-64"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
index 0587537bd8e5a615f5cd097ef9dfceec6bd3d13c..b99627be59e73a8beba88e13361f779527e0f245 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.115",
+      "ip": "172.16.18.115",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-65.grenoble.grid5000.fr",
+      "network_address": "edel-65-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-65"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
index ed963cbb8b65e9ccc655635955fb0475035bf660..16cb2f2655164cc087d5ee68d5c09a5df5d2a023 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.116",
+      "ip": "172.16.18.116",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-66.grenoble.grid5000.fr",
+      "network_address": "edel-66-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-66"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
index f134489e200888b811ec537f60a6fb54036cab3c..a50b4e1c11e274728f8b20f3f5c5280b27c56ed2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.117",
+      "ip": "172.16.18.117",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-67.grenoble.grid5000.fr",
+      "network_address": "edel-67-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-67"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
index 7791eaff585444f1185cd2373d019208ed5247dd..4d0ff4293e1074fefbf1c10c230d88bee58603ce 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.118",
+      "ip": "172.16.18.118",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-68.grenoble.grid5000.fr",
+      "network_address": "edel-68-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-68"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
index 832e5fe3373d1a5f08e14d12745efc1dc55301a7..6f31a85f02e759dae5b108e5a04ead7608e848b5 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.119",
+      "ip": "172.16.18.119",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-69.grenoble.grid5000.fr",
+      "network_address": "edel-69-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-69"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
index f1c3a090cf6dd623bcb48097a5c8ed594052a095..6b042db769dc7c5a376eac55ec420bdd9676481b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.57",
+      "ip": "172.16.18.57",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-7.grenoble.grid5000.fr",
+      "network_address": "edel-7-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-7"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
index c0db11360f7fdbeb9b605490d53791a10c0f92f1..abfe9c5b193341852c466f81bc65417ecdd7f97d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.120",
+      "ip": "172.16.18.120",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-70.grenoble.grid5000.fr",
+      "network_address": "edel-70-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-70"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
index 7f4b28b356231177dedc1ce940b8dad7e378ca22..797fa52e51e212e4f32d875b980460a9e570f9cc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.121",
+      "ip": "172.16.18.121",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-71.grenoble.grid5000.fr",
+      "network_address": "edel-71-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-71"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
index 01279eeb35e4d0260b366073043106b127601e7f..5d3490ea9c08e2893618e5408bf6b1cfea401891 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.122",
+      "ip": "172.16.18.122",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-72.grenoble.grid5000.fr",
+      "network_address": "edel-72-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-72"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
index 00a61a01d7194076594910136e9acaae0eb3cff7..c00145d0f265dc764e1a0482a2ab77fa0b29f2d0 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.58",
+      "ip": "172.16.18.58",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-8.grenoble.grid5000.fr",
+      "network_address": "edel-8-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-8"
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
index 2be2f109badb177ae3cc4536cb09e9cff46f0921..df407be9f543abd984ce5b1e155cdef7d9824547 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
@@ -13,11 +13,11 @@
       "device": "ib0",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.16.59",
+      "ip": "172.16.18.59",
       "management": false,
       "mountable": true,
       "mounted": true,
-      "network_address": "edel-9.grenoble.grid5000.fr",
+      "network_address": "edel-9-ib0.grenoble.grid5000.fr",
       "rate": 40000000000,
       "vendor": "Mellanox",
       "version": "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s"
@@ -81,7 +81,7 @@
   "supported_job_types": {
     "besteffort": true,
     "deploy": true,
-    "virtual": "false"
+    "virtual": "ivt"
   },
   "type": "node",
   "uid": "edel-9"
diff --git a/data/grid5000/sites/grenoble/environments/sid-x64-base-1.0.json b/data/grid5000/sites/grenoble/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f5666889a1c3447952d2ef846d177297..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/sid-x64-base-1.1.json b/data/grid5000/sites/grenoble/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f30ebf993ecb9f571209108b7f2465..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/sid-x64-big-1.1.json b/data/grid5000/sites/grenoble/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4910f0ce2ee266fa0a3cbc5c8e8026..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/grenoble/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb89fe5ad72ec71d71f854a4c794912..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/grenoble/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0fd8594a1d48d11529ed5620ecbb420..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/grenoble/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/squeeze-x64-base-0.8.json b/data/grid5000/sites/grenoble/environments/squeeze-x64-base-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..30b0a480400b40905271d51043768003e62cde82
--- /dev/null
+++ b/data/grid5000/sites/grenoble/environments/squeeze-x64-base-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-base-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/squeeze-x64-big-0.8.json b/data/grid5000/sites/grenoble/environments/squeeze-x64-big-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..f651be05618dcb7f2b8a6e1a53624a164aef6984
--- /dev/null
+++ b/data/grid5000/sites/grenoble/environments/squeeze-x64-big-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-big-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/squeeze-x64-min-0.8.json b/data/grid5000/sites/grenoble/environments/squeeze-x64-min-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..9006de5d2a4ceeebc8b7382fe52c6825a260994f
--- /dev/null
+++ b/data/grid5000/sites/grenoble/environments/squeeze-x64-min-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-min-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/squeeze-x64-nfs-0.8.json b/data/grid5000/sites/grenoble/environments/squeeze-x64-nfs-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..5185a0bb1ddf7c35393027250bf6959b6fd4dee8
--- /dev/null
+++ b/data/grid5000/sites/grenoble/environments/squeeze-x64-nfs-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-nfs-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/environments/squeeze-x64-xen-0.8.json b/data/grid5000/sites/grenoble/environments/squeeze-x64-xen-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..1812b44b1faddbc83cdeade8c1b7939e9b0918ae
--- /dev/null
+++ b/data/grid5000/sites/grenoble/environments/squeeze-x64-xen-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-xen-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/chimint.json b/data/grid5000/sites/lille/clusters/chimint/chimint.json
new file mode 100644
index 0000000000000000000000000000000000000000..96359d8c595a8736be4c8c27a6e1f3ba285f121c
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/chimint.json
@@ -0,0 +1,6 @@
+{
+  "created_at": "Thu, 24 Mar 2011 23:00:00 GMT",
+  "model": "Dell PowerEdge R410",
+  "type": "cluster",
+  "uid": "chimint"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..95f466367897714aee2f9c3469613fc170ebf338
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-1.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.1",
+      "mac": "84:2b:2b:72:d4:7f",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-1-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.1",
+      "mac": "84:2b:2b:72:d4:80",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-1.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.1",
+      "mac": "84:2b:2b:72:d4:81",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-1-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json
new file mode 100644
index 0000000000000000000000000000000000000000..fe56fbe219f47c00f19d073ca59230f248692f47
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-10.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.10",
+      "mac": "84:2b:2b:72:d4:49",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-10-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.10",
+      "mac": "84:2b:2b:72:d4:4a",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-10.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.10",
+      "mac": "84:2b:2b:72:d4:4b",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-10-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-10"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json
new file mode 100644
index 0000000000000000000000000000000000000000..73b13a786190297b0c2e25bc884ffb01771064ae
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-11.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.11",
+      "mac": "84:2b:2b:70:c9:9d",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-11-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.11",
+      "mac": "84:2b:2b:70:c9:9e",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-11.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.11",
+      "mac": "84:2b:2b:70:c9:9f",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-11-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-11"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json
new file mode 100644
index 0000000000000000000000000000000000000000..c799b485089fa2394f07da5068d6b8b42e7ba669
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-12.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.12",
+      "mac": "84:2b:2b:72:d5:ea",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-12-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.12",
+      "mac": "84:2b:2b:72:d5:eb",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-12.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.12",
+      "mac": "84:2b:2b:72:d5:ec",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-12-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-12"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json
new file mode 100644
index 0000000000000000000000000000000000000000..6e02b299d66097659589bafe19c5e8656f6c955b
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-13.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.13",
+      "mac": "84:2b:2b:71:f1:24",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-13-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.13",
+      "mac": "84:2b:2b:71:f1:25",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-13.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.13",
+      "mac": "84:2b:2b:71:f1:26",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-13-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-13"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json
new file mode 100644
index 0000000000000000000000000000000000000000..e6f91de5cb8ad12d81d69ea98870fd01887955a9
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-14.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.14",
+      "mac": "84:2b:2b:72:d5:67",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-14-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.14",
+      "mac": "84:2b:2b:72:d5:68",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-14.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.14",
+      "mac": "84:2b:2b:72:d5:69",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-14-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-14"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json
new file mode 100644
index 0000000000000000000000000000000000000000..4e26caea13f98c51dbb7c16597cd97323c877d8b
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-15.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.15",
+      "mac": "84:2b:2b:72:d7:7a",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-15-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.15",
+      "mac": "84:2b:2b:72:d7:7b",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-15.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.15",
+      "mac": "84:2b:2b:72:d7:7c",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-15-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-15"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json
new file mode 100644
index 0000000000000000000000000000000000000000..04c4bbfa6bd318d2fadd9a847166e0e74461dd1e
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-16.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.16",
+      "mac": "84:2b:2b:72:d5:db",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-16-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.16",
+      "mac": "84:2b:2b:72:d5:dc",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-16.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.16",
+      "mac": "84:2b:2b:72:d5:dd",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-16-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-16"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json
new file mode 100644
index 0000000000000000000000000000000000000000..2d584edc23ddfefc815daaf90c5bf87976af0876
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-17.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.17",
+      "mac": "84:2b:2b:70:f6:92",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-17-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.17",
+      "mac": "84:2b:2b:70:f6:93",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-17.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.17",
+      "mac": "84:2b:2b:70:f6:94",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-17-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-17"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json
new file mode 100644
index 0000000000000000000000000000000000000000..a65648f453a03b01236de0dc239ef4df77fc5b8f
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-18.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.18",
+      "mac": "84:2b:2b:72:d7:89",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-18-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.18",
+      "mac": "84:2b:2b:72:d7:8a",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-18.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.18",
+      "mac": "84:2b:2b:72:d7:8b",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-18-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-18"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json
new file mode 100644
index 0000000000000000000000000000000000000000..d1a271d204831f3e8b48ec1e58a26c23519df589
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-19.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.19",
+      "mac": "84:2b:2b:70:c6:21",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-19-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.19",
+      "mac": "84:2b:2b:70:c6:22",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-19.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.19",
+      "mac": "84:2b:2b:70:c6:23",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-19-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-19"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..7eb8b861f12aecd6afa17b4107c1db7313075c13
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-2.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.2",
+      "mac": "84:2b:2b:70:4f:4c",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-2-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.2",
+      "mac": "84:2b:2b:70:4f:4d",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-2.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.2",
+      "mac": "84:2b:2b:70:4f:4e",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-2-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json
new file mode 100644
index 0000000000000000000000000000000000000000..b3d90b1b4e2b73bb3feb2856df476fe5da9dbf58
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-20.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.20",
+      "mac": "84:2b:2b:70:c3:d5",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-20-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.20",
+      "mac": "84:2b:2b:70:c3:d6",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-20.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.20",
+      "mac": "84:2b:2b:70:c3:d7",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-20-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-20"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..76cd1d0d8e665649fb0c2b78bb69fc8c8f360109
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-3.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.3",
+      "mac": "84:2b:2b:70:4e:1e",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-3-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.3",
+      "mac": "84:2b:2b:70:4e:1f",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-3.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.3",
+      "mac": "84:2b:2b:70:4e:20",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-3-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json
new file mode 100644
index 0000000000000000000000000000000000000000..b1eb35b980b6c3b1d4cf42386d887282cf69a430
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-4.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.4",
+      "mac": "84:2b:2b:70:cc:89",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-4-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.4",
+      "mac": "84:2b:2b:70:cc:8a",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-4.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.4",
+      "mac": "84:2b:2b:70:cc:8b",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-4-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-4"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json
new file mode 100644
index 0000000000000000000000000000000000000000..833c5e5e791fd34c8af1817a97db9010dca8176e
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-5.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.5",
+      "mac": "84:2b:2b:70:cc:92",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-5-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.5",
+      "mac": "84:2b:2b:70:cc:93",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-5.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.5",
+      "mac": "84:2b:2b:70:cc:94",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-5-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-5"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json
new file mode 100644
index 0000000000000000000000000000000000000000..913b05417b1127982f9468fabec6744fc8f631f8
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-6.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.6",
+      "mac": "84:2b:2b:72:d5:9e",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-6-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.6",
+      "mac": "84:2b:2b:72:d5:9f",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-6.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.6",
+      "mac": "84:2b:2b:72:d5:a0",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-6-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-6"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json
new file mode 100644
index 0000000000000000000000000000000000000000..4d4b2807b47397eed69f8e58a8ca683470c6500c
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-7.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.7",
+      "mac": "84:2b:2b:72:b3:44",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-7-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.7",
+      "mac": "84:2b:2b:72:b3:45",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-7.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.7",
+      "mac": "84:2b:2b:72:b3:46",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-7-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-7"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json
new file mode 100644
index 0000000000000000000000000000000000000000..8e3189e2d4eda31c644d4867054b2c28a7b3825f
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-8.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.8",
+      "mac": "84:2b:2b:72:da:c3",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-8-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.8",
+      "mac": "84:2b:2b:72:da:c4",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-8.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.8",
+      "mac": "84:2b:2b:72:da:c5",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-8-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-8"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json
new file mode 100644
index 0000000000000000000000000000000000000000..50541756cf73fca03c57eb6c9c46ae58ddc3d76f
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chimint/nodes/chimint-9.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 17179869184,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.9",
+      "mac": "84:2b:2b:72:cb:e3",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-9-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "device": "eth1",
+      "driver": "bnx2",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.9",
+      "mac": "84:2b:2b:72:cb:e4",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chimint-9.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Broadcom",
+      "version": "NetXtreme II BCM5716"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.9",
+      "mac": "84:2b:2b:72:cb:e5",
+      "management": true,
+      "mountable": false,
+      "network_address": "chimint-9-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "megaraid_sas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chimint-9"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chirloute/chirloute.json b/data/grid5000/sites/lille/clusters/chirloute/chirloute.json
new file mode 100644
index 0000000000000000000000000000000000000000..422e2aa902f1f7152d3a4a8cedf977a6d6aba79e
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chirloute/chirloute.json
@@ -0,0 +1,6 @@
+{
+  "created_at": "Thu, 24 Mar 2011 23:00:00 GMT",
+  "model": "Dell PowerEdge C6100",
+  "type": "cluster",
+  "uid": "chirloute"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
new file mode 100644
index 0000000000000000000000000000000000000000..04377d73315fc38cfc72246483cd5a22738a47eb
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-1.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.21",
+      "mac": "00:26:6c:f9:18:e4",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-1-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.21",
+      "mac": "00:26:6c:f9:18:e5",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-1.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.21",
+      "mac": "00:26:6c:f9:18:e6",
+      "management": true,
+      "mountable": false,
+      "network_address": "chirloute-1-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chirloute-1"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
new file mode 100644
index 0000000000000000000000000000000000000000..013e9bd1460dc97a46c96347b5ef8c5952ec82a5
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-2.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.22",
+      "mac": "00:26:6c:f9:17:e8",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-2-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.22",
+      "mac": "00:26:6c:f9:17:e9",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-2.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.22",
+      "mac": "00:26:6c:f9:17:ea",
+      "management": true,
+      "mountable": false,
+      "network_address": "chirloute-2-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chirloute-2"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
new file mode 100644
index 0000000000000000000000000000000000000000..c8a5eb6f7f80c246e29612471cc3634714c22fb6
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-3.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.23",
+      "mac": "00:26:6c:f9:15:70",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-3-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.23",
+      "mac": "00:26:6c:f9:15:71",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-3.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.23",
+      "mac": "00:26:6c:f9:15:72",
+      "management": true,
+      "mountable": false,
+      "network_address": "chirloute-3-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chirloute-3"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
new file mode 100644
index 0000000000000000000000000000000000000000..875c0e0a4a8699e8de576b734f9388663735ceb8
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-4.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.24",
+      "mac": "00:26:6c:f9:19:60",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-4-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.24",
+      "mac": "00:26:6c:f9:19:61",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-4.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.24",
+      "mac": "00:26:6c:f9:19:62",
+      "management": true,
+      "mountable": false,
+      "network_address": "chirloute-4-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chirloute-4"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
new file mode 100644
index 0000000000000000000000000000000000000000..edfcc99d8bb3283e4450676a1390b88e6b6357a3
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-5.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.25",
+      "mac": "00:26:6c:f9:16:08",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-5-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.25",
+      "mac": "00:26:6c:f9:16:09",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-5.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.25",
+      "mac": "00:26:6c:f9:16:0a",
+      "management": true,
+      "mountable": false,
+      "network_address": "chirloute-5-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chirloute-5"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
new file mode 100644
index 0000000000000000000000000000000000000000..2a1a933fbd348594e09d798b8b50cbbd78295582
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-6.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.26",
+      "mac": "00:26:6c:f9:17:20",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-6-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.26",
+      "mac": "00:26:6c:f9:17:21",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-6.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.26",
+      "mac": "00:26:6c:f9:17:22",
+      "management": true,
+      "mountable": false,
+      "network_address": "chirloute-6-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chirloute-6"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
new file mode 100644
index 0000000000000000000000000000000000000000..1cf18b046f736c4803a3fb7384b81250dde88baa
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-7.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.27",
+      "mac": "00:26:6c:f9:17:b8",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-7-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.27",
+      "mac": "00:26:6c:f9:17:b9",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-7.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.27",
+      "mac": "00:26:6c:f9:17:b9",
+      "management": true,
+      "mountable": false,
+      "network_address": "chirloute-7-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chirloute-7"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
new file mode 100644
index 0000000000000000000000000000000000000000..960a55162db9d2376d18471569079b8dc758aa3b
--- /dev/null
+++ b/data/grid5000/sites/lille/clusters/chirloute/nodes/chirloute-8.json
@@ -0,0 +1,91 @@
+{
+  "architecture": {
+    "platform_type": "x86_64",
+    "smp_size": 2,
+    "smt_size": 8
+  },
+  "main_memory": {
+    "ram_size": 8589934592,
+    "virtual_size": null
+  },
+  "network_adapters": [
+    {
+      "device": "eth0",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.160.28",
+      "mac": "00:26:6c:f9:19:80",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-8-eth0.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "device": "eth1",
+      "driver": "igb",
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.159.28",
+      "mac": "00:26:6c:f9:19:81",
+      "management": false,
+      "mountable": true,
+      "mounted": true,
+      "network_address": "chirloute-8.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "switch_port": null,
+      "vendor": "Intel",
+      "version": "82576EB"
+    },
+    {
+      "enabled": true,
+      "interface": "Ethernet",
+      "ip": "192.168.158.28",
+      "mac": "00:26:6c:f9:19:82",
+      "management": true,
+      "mountable": false,
+      "network_address": "chirloute-8-ipmi.lille.grid5000.fr",
+      "rate": 1000000000,
+      "switch": "gw",
+      "vendor": null,
+      "version": null
+    }
+  ],
+  "operating_system": {
+    "name": null,
+    "release": null,
+    "version": null
+  },
+  "processor": {
+    "cache_l1": null,
+    "cache_l1d": null,
+    "cache_l1i": null,
+    "cache_l2": 12582912,
+    "clock_speed": 2400000000.0,
+    "instruction_set": "",
+    "model": "Intel Xeon",
+    "other_description": "",
+    "vendor": "Intel",
+    "version": "E5620"
+  },
+  "storage_devices": [
+    {
+      "driver": "mptsas",
+      "interface": "SATA",
+      "raid": "0",
+      "size": 279396772384.644
+    }
+  ],
+  "supported_job_types": {
+    "besteffort": true,
+    "deploy": true,
+    "virtual": false
+  },
+  "type": "node",
+  "uid": "chirloute-8"
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/lenny-x64-big-2.3.json b/data/grid5000/sites/lille/environments/lenny-x64-big-2.3.json
new file mode 120000
index 0000000000000000000000000000000000000000..854ea1f82086b27e25bf37b2bac87f8e46527475
--- /dev/null
+++ b/data/grid5000/sites/lille/environments/lenny-x64-big-2.3.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/lenny-x64-big-2.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/lenny-x64-min-0.8.json b/data/grid5000/sites/lille/environments/lenny-x64-min-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..b62b4a3b9cd5fec298f6db3aca0a6a58bf580c83
--- /dev/null
+++ b/data/grid5000/sites/lille/environments/lenny-x64-min-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/lenny-x64-min-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/lenny-x64-nfs-2.3.json b/data/grid5000/sites/lille/environments/lenny-x64-nfs-2.3.json
new file mode 120000
index 0000000000000000000000000000000000000000..76ed78e729d3c69e8f63d49fccf129ca1ab8e0ff
--- /dev/null
+++ b/data/grid5000/sites/lille/environments/lenny-x64-nfs-2.3.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/lenny-x64-nfs-2.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/lenny-x64-xen-2.3.json b/data/grid5000/sites/lille/environments/lenny-x64-xen-2.3.json
new file mode 120000
index 0000000000000000000000000000000000000000..49a15174194882afa6d8a9596439bf8dd33b3c0c
--- /dev/null
+++ b/data/grid5000/sites/lille/environments/lenny-x64-xen-2.3.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/lenny-x64-xen-2.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/sid-x64-base-1.0.json b/data/grid5000/sites/lille/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f5666889a1c3447952d2ef846d177297..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/sid-x64-base-1.1.json b/data/grid5000/sites/lille/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f30ebf993ecb9f571209108b7f2465..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/sid-x64-big-1.1.json b/data/grid5000/sites/lille/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4910f0ce2ee266fa0a3cbc5c8e8026..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/lille/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb89fe5ad72ec71d71f854a4c794912..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/lille/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0fd8594a1d48d11529ed5620ecbb420..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lille/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/squeeze-x64-base-0.8.json b/data/grid5000/sites/lille/environments/squeeze-x64-base-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..30b0a480400b40905271d51043768003e62cde82
--- /dev/null
+++ b/data/grid5000/sites/lille/environments/squeeze-x64-base-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-base-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/squeeze-x64-big-0.8.json b/data/grid5000/sites/lille/environments/squeeze-x64-big-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..f651be05618dcb7f2b8a6e1a53624a164aef6984
--- /dev/null
+++ b/data/grid5000/sites/lille/environments/squeeze-x64-big-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-big-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/squeeze-x64-min-0.8.json b/data/grid5000/sites/lille/environments/squeeze-x64-min-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..9006de5d2a4ceeebc8b7382fe52c6825a260994f
--- /dev/null
+++ b/data/grid5000/sites/lille/environments/squeeze-x64-min-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-min-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/squeeze-x64-nfs-0.8.json b/data/grid5000/sites/lille/environments/squeeze-x64-nfs-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..5185a0bb1ddf7c35393027250bf6959b6fd4dee8
--- /dev/null
+++ b/data/grid5000/sites/lille/environments/squeeze-x64-nfs-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-nfs-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/environments/squeeze-x64-xen-0.8.json b/data/grid5000/sites/lille/environments/squeeze-x64-xen-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..1812b44b1faddbc83cdeade8c1b7939e9b0918ae
--- /dev/null
+++ b/data/grid5000/sites/lille/environments/squeeze-x64-xen-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-xen-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-1.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-1.json
index 6771d85a784364a95da94943863c62ee0d5b83fe..9264ecef32740d468d86c3e81d799925acd13214 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-1.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-1.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.1",
-      "mac": "",
+      "mac": "00:60:dd:48:60:46",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-10.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-10.json
index a5d43faf79bc97f4b10268ea24926615c156fcf0..d90351bf10a53301df855aaff9a62e007c583fe3 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-10.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-10.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.10",
-      "mac": "",
+      "mac": "00:60:dd:48:60:45",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-11.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-11.json
index 57fc615838f93aa6046fdb6bd8609b8dc4201ce5..696f487a80e3fb6e096edf7f37b6044ba8fc72cf 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-11.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-11.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.11",
-      "mac": "",
+      "mac": "00:60:dd:48:5f:ef",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-12.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-12.json
index d4da4a754154ddcb822e1788c319bb05897bd8fd..d9209d5f88194375712cb85d6c3357aa48b7789f 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-12.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-12.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.12",
-      "mac": "",
+      "mac": "00:60:dd:48:60:4d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-13.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-13.json
index 4cbebbc860653e3f18452661a32978aea59194f9..ba47d1c0f94feec36d9c85b740ebc4d9643cec13 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-13.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-13.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.13",
-      "mac": "",
+      "mac": "00:60:dd:48:60:4b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-14.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-14.json
index f885bc1614f93fd5a04ebdce825d02bb818d41c6..62af38c88a1ff7d1cad474d6f9301c8f4c7fbbf2 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-14.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-14.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.14",
-      "mac": "",
+      "mac": "00:60:dd:48:60:4a",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-15.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-15.json
index f7d6a71ff690f501bf94d996735c2bb30dfd122c..04e0fa47b9f90c291c29af4f3f998d13a8a755c0 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-15.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-15.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.15",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-16.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-16.json
index 0846c79d5b3227e179701e11bb1fb23954ac9381..9c8a45a578e1c4120fc814fc8d95f2d4a202f0bd 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-16.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-16.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.16",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-17.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-17.json
index 0b74f15ca0e164fbf67718849855dceca5bae2b3..6d0f9fdbde7c4f005948d59f8f41efdad14fb26e 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-17.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-17.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.17",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-18.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-18.json
index 84645d25d85960769b78dad8eca16e48db63b647..6977f6f2eab1ff082519103b9fabdcfa361d9ca4 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-18.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-18.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.18",
-      "mac": "",
+      "mac": "00:60:dd:48:60:35",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-19.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-19.json
index 043dee2bf3237d020fb9ddc410560859dde83091..c4a1d30d86a6b0152c19de4a3b649c439074bc3d 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-19.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-19.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.19",
-      "mac": "",
+      "mac": "00:60:dd:48:5f:f6",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-2.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-2.json
index 1aa1582bfa8cdfd9c053273ea8bea55b9626e873..c211800cb91a01a304639ebb6cdea3cce609d60b 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-2.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-2.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.2",
-      "mac": "",
+      "mac": "00:60:dd:48:60:3e",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-20.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-20.json
index ec1849a4f25ecc1febd997cf151f1da762cbd09c..d5d286037982e18776ce5f6aa1f814dd9e78a20a 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-20.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-20.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.20",
-      "mac": "",
+      "mac": "00:60:dd:48:60:1b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-21.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-21.json
index d2c264155472486f96f3f8af6daafa9679e91f96..159b20053755aee0f87d92b73251c9620548cc17 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-21.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-21.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.21",
-      "mac": "",
+      "mac": "00:60:dd:48:5f:ea",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-22.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-22.json
index f7727fb2e73de6bb69d2d14210ba4fb8e560d7bf..4424999971402b2b8068373e3f036edf51ab657f 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-22.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-22.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.22",
-      "mac": "",
+      "mac": "00:60:dd:48:5f:a7",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-23.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-23.json
index f8e0d3d0fb070897302ea61ee732c9b9b939f7c0..c3e6d8273f9043130874f31c3a0058429fd8e137 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-23.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-23.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.23",
-      "mac": "",
+      "mac": "00:60:dd:48:5f:e1",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-24.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-24.json
index c7eda1afa4c139edcd00a5033c11cdab624aa5cb..48da37eb47dc225505c252560fa956350d4e7170 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-24.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-24.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.24",
-      "mac": "",
+      "mac": "00:60:dd:48:5f:b0",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-25.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-25.json
index 2ba503def62882462275b5d4616558dd7d1f9b10..b2c5ed04220f3d92c49d967839cfde40a67f5dcb 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-25.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-25.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.25",
-      "mac": "",
+      "mac": "00:60:dd:48:5f:aa",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-26.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-26.json
index 68725c59c8808eb5891ed9734d9c81ed685ab952..61548e1a74b49b320d9bc94bb661f9136ff52baf 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-26.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-26.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.26",
-      "mac": "",
+      "mac": "00:60:dd:48:5f:af",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-27.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-27.json
index 80d44753850c01151c009eaa650d81f5aa7d7923..787a973126189bece9651ebf2b152c9fef63a16d 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-27.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-27.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.27",
-      "mac": "",
+      "mac": "00:60:dd:48:5f:dd",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-28.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-28.json
index f0c46c568e30e28917a292452760722a24cdc52c..c6ca5d61e679efff78ffe11f9de5086df0648d4a 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-28.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-28.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.28",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-29.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-29.json
index a0807bba2059aa3f934c665c1dd3c6942e1fa5d6..6dde74dd157a6a78a1cfbcaa16e96ce768f3bbe5 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-29.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-29.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.29",
-      "mac": "",
+      "mac": "00:60:dd:48:5f:a9",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-3.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-3.json
index c79726aa12507662eb3d2d7382de6e7cdfe433c2..c6703fc481fc5801a96db684e3649d3fb3f10933 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-3.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-3.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.3",
-      "mac": "",
+      "mac": "00:60:dd:48:5f:de",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-30.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-30.json
index f9b44685ffe1233bfd2459cc2af07727a52fa635..a56bdfc2c91edc28eb9a2db567bb0d996bc7b9ec 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-30.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-30.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.30",
-      "mac": "",
+      "mac": "00:60:dd:48:60:3c",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-31.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-31.json
index 7d6c1660b4966b6b7d6226252d9a6bac26c82f49..14750979d25bb35cfbd10537672e7de946d629a7 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-31.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-31.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.31",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-32.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-32.json
index 120d83100c8d1ff7f45293e0e5af574fbfdab4d5..36d3136388b5473f150f7c70617fd7c61a9b9864 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-32.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-32.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.32",
-      "mac": "",
+      "mac": "00:60:dd:48:60:3b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json
index df3d2dd76b68999eeb9f24363edf59e7a6341e7f..4a8be74b710f2391c63a1d0c48090e7962a8b075 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-33.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.33",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-34.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-34.json
index 10594b69a5ff5b7ec4683b454aea7b3b30103d2c..980e0f399587d526ebbdb7be106523c59f9bf405 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-34.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-34.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.34",
-      "mac": "",
+      "mac": "00:60:dd:48:43:3c",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-35.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-35.json
index 34138092a6997b58d5531d37df3beb083794add7..62c81451a43bc4bb4a09b81ab9dfc04825701765 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-35.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-35.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.35",
-      "mac": "",
+      "mac": "00:60:dd:48:43:67",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-36.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-36.json
index 79634f4dd4e0496fd498ec58db1ada31a59266b3..39b1f2b92a67ab4d54e817fec18d9056d10d2b18 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-36.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-36.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.36",
-      "mac": "",
+      "mac": "00:60:dd:48:43:2d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-37.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-37.json
index 3d1a84f40993d1e4b934f2b9bbbec7835b9468ec..a38928e8f45b1f69113e2d5af95facdc8203318a 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-37.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-37.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.37",
-      "mac": "",
+      "mac": "00:60:dd:48:43:58",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-38.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-38.json
index 35e413d5e214190984d62a8d33e691ebc9c44332..bb09c49d7e39f638e2f3d21e50d371d723be0f7e 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-38.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-38.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.38",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-39.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-39.json
index 7fbde21513b014b498f689914138b728de75709d..afa57525ec0b535d7ba3d9465898fc721a10bdb7 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-39.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-39.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.39",
-      "mac": "",
+      "mac": "00:60:dd:48:43:29",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-4.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-4.json
index ece30348c992266c4a7f697d47e396c8a4a80203..76fec220a96e9ef331cc6951b3ac3e02d563f7aa 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-4.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-4.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.4",
-      "mac": "",
+      "mac": "00:60:dd:48:60:3d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-40.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-40.json
index c5a4f33ab02421b0be37ab778c2b98962bb3407e..3d39a21ebc5b2e51283f8e332e8823b6de6a3b77 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-40.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-40.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.40",
-      "mac": "",
+      "mac": "00:60:dd:48:43:34",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-41.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-41.json
index fa9a6d55475abc809ca70cf22582975e244af5fb..5f32f26fb171e1e2b00d2f5ead1f1cc13dea804c 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-41.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-41.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.41",
-      "mac": "",
+      "mac": "00:60:dd:48:43:5b",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-42.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-42.json
index abb6cfb3791554e628be432730b68233a9f80987..a4039786879775855eab657abfa04e1ee543ad3d 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-42.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-42.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.42",
-      "mac": "",
+      "mac": "00:60:dd:48:43:4d",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-43.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-43.json
index b339a8136167e5cf6acd872e65a45df261aca4b7..53a324b4da82bc7f80cdcc7f3301c8eb04e75292 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-43.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-43.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.43",
-      "mac": "",
+      "mac": "00:60:dd:48:43:59",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-44.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-44.json
index 2c9b2c346ae7449ab1b516fea04e3522120b4e0b..28c2758c243b5f8d8afe84894552b9c9f57d61a0 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-44.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-44.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.44",
-      "mac": "",
+      "mac": "00:60:dd:48:43:2e",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-45.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-45.json
index f3f02561e025ada3419516d53d7c1a6f1cf427b2..0cbf47dc1ab464971243d74d2a53095658078945 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-45.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-45.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.45",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-46.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-46.json
index 35614c46b84d658315738a8c25360c2ab602623d..95ec44caeb54a1e966235111df8662d05b43d9cc 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-46.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-46.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.46",
-      "mac": "",
+      "mac": "00:60:dd:48:43:75",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-47.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-47.json
index be0aa2cafab738e0f54655ce6397bd8a6f21ac9c..9ea932dcc61cc3bf0020a663e1bde933ac4fdee0 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-47.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-47.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.47",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json
index ff0ce58c61c16bf219f2a6a23a367925f77d8812..8dca9e05cb1a58507401488c8516605d5069816c 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-48.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.48",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-49.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-49.json
index e5ff753ab764b0e4dca655eaf1d014f6d9125162..a487b01319e4377c5388a1a48a626e40ca0b3c90 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-49.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-49.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.49",
-      "mac": "",
+      "mac": "00:60:dd:48:42:c6",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json
index c42c7694f33e771007446c082512c4652339a3da..1c8423e76dc0d21b821844505d16990e29334908 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-5.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.5",
-      "mac": "",
+      "mac": "00:60:dd:48:60:44",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json
index aec242ecb35cfaa0bf570c32c67a65a4ece6b151..ab5801775dbce4fc2ffa2f1fc627017eab1774c7 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-50.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.50",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json
index af51c3228bc59c13dceebb886db8b03a7c047aca..769b101c36b1e1acf727f3cc61c83c5e09b620bf 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-51.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.51",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-52.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-52.json
index cc67f40d03b9068bf664a2b13a7b05728d30dd1b..b21f5f2fb1d2dfe4885ec10fc32ea3a960b5888f 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-52.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-52.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.52",
-      "mac": "",
+      "mac": "00:60:dd:48:43:77",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-53.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-53.json
index 7111fef33193db8f138fdf4d26f9079b2924196a..f0020b47165fce11041641b15890e1f33aac1750 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-53.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-53.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.53",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-54.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-54.json
index 8149b74d8792aea892f30158de387d85abfb4559..2c133d35a1aefd8879e4e3e7a9f2a6b5d408b468 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-54.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-54.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.54",
-      "mac": "",
+      "mac": "00:60:dd:48:43:70",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-55.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-55.json
index 5724832b9b89d20e38d2af4d3b483017ccae5e01..0ee3a435dc6976d040bf2a482402d7bb0556522e 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-55.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-55.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.55",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json
index d7b6be8dd112b23765d48af4b191720f58b91ab7..37e34f0493cb5d72ce98283c590c7998690708ac 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-56.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.56",
-      "mac": "",
+      "mac": "00:60:dd:48:43:2a",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-6.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-6.json
index aadf7c948a5860d4f1f8467495846e602f0fc237..3ca92f87bc52289d7a3e0dfaa774fb7cea1bf8d8 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-6.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-6.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.6",
-      "mac": "",
+      "mac": "00:60:dd:48:60:38",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-7.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-7.json
index b6d2fe3fb57c2010a7bbdfda5fd2b5c9b45366b3..8c711e31e77ca45ef0fd36030ffe98af0e72c445 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-7.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-7.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.7",
-      "mac": "",
+      "mac": null,
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-8.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-8.json
index 9f32bbf852e472cdb343d96508249164f6273a7d..b759b6900061cfc0408058ecf674c56739c1d20f 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-8.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-8.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.8",
-      "mac": "",
+      "mac": "00:60:dd:48:5f:f4",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json
index 4248af41f53f4800fa2d7250be8ae8aebfecbaad..27cac98519528e7b9edfc6230e6cfc48599ebe09 100755
--- a/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json
+++ b/data/grid5000/sites/lyon/clusters/capricorne/nodes/capricorne-9.json
@@ -39,11 +39,11 @@
     },
     {
       "device": "myri0",
-      "driver": "",
+      "driver": "mx",
       "enabled": true,
       "interface": "Myrinet",
       "ip": "10.69.8.9",
-      "mac": "",
+      "mac": "00:60:dd:48:5f:db",
       "management": false,
       "mountable": true,
       "mounted": false,
diff --git a/data/grid5000/sites/lyon/environments/sid-x64-base-1.0.json b/data/grid5000/sites/lyon/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f5666889a1c3447952d2ef846d177297..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/sid-x64-base-1.1.json b/data/grid5000/sites/lyon/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f30ebf993ecb9f571209108b7f2465..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/sid-x64-big-1.1.json b/data/grid5000/sites/lyon/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4910f0ce2ee266fa0a3cbc5c8e8026..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/lyon/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb89fe5ad72ec71d71f854a4c794912..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/lyon/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0fd8594a1d48d11529ed5620ecbb420..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/lyon/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/squeeze-x64-base-0.8.json b/data/grid5000/sites/lyon/environments/squeeze-x64-base-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..30b0a480400b40905271d51043768003e62cde82
--- /dev/null
+++ b/data/grid5000/sites/lyon/environments/squeeze-x64-base-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-base-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/squeeze-x64-big-0.8.json b/data/grid5000/sites/lyon/environments/squeeze-x64-big-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..f651be05618dcb7f2b8a6e1a53624a164aef6984
--- /dev/null
+++ b/data/grid5000/sites/lyon/environments/squeeze-x64-big-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-big-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/squeeze-x64-min-0.8.json b/data/grid5000/sites/lyon/environments/squeeze-x64-min-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..9006de5d2a4ceeebc8b7382fe52c6825a260994f
--- /dev/null
+++ b/data/grid5000/sites/lyon/environments/squeeze-x64-min-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-min-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/squeeze-x64-nfs-0.8.json b/data/grid5000/sites/lyon/environments/squeeze-x64-nfs-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..5185a0bb1ddf7c35393027250bf6959b6fd4dee8
--- /dev/null
+++ b/data/grid5000/sites/lyon/environments/squeeze-x64-nfs-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-nfs-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/environments/squeeze-x64-xen-0.8.json b/data/grid5000/sites/lyon/environments/squeeze-x64-xen-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..1812b44b1faddbc83cdeade8c1b7939e9b0918ae
--- /dev/null
+++ b/data/grid5000/sites/lyon/environments/squeeze-x64-xen-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-xen-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json
index f9910fc0c52249f0fc123df489843aa07ec16066..b2a20d73c6f8bcef4b9b79601bf6947a63acb2eb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.1",
+      "ip": "172.18.64.1",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:81",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
index 040e25a3fbb2c42eb89af344a83a8d3efcf2407a..06fbb1b0341040299d1d5ca4dcecdc18d7ab4fb2 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.10",
+      "ip": "172.18.64.10",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:6d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
index 6901653fe88c7e589cc1f25393b379949347e7a9..7187458512d95a2df6c8b38f09eace08514cc24a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.100",
+      "ip": "172.18.64.100",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:0d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
index a5a1ee9114a83d41f401fba6687da50abe39015f..bdc9c393ad894ed438337b39b8d8ebb6d3755128 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.101",
+      "ip": "172.18.64.101",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
index 1ed900f994737c19911aea5cb376bd4116c0c21a..b077e53ac44176fcb06b52c0d276148f65fa8a0e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.102",
+      "ip": "172.18.64.102",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:71",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
index 542e857b74a315fdd92b548b1343e27fd98b1ef0..3e1973026db17b66e7a35c3826bb0a1569a1ef56 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.103",
+      "ip": "172.18.64.103",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:49",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
index e06b354af406a69b0cc43bdbc3a39414f09dcbce..08a617e4525e46869f5f64a59ae8204fb6c7c5a0 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.104",
+      "ip": "172.18.64.104",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:15",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
index f4139545d1e0183ce8e73e052851932ecac86eed..c49198b5c4d5099880d75ba3f93099d16dd471f7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.105",
+      "ip": "172.18.64.105",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:19",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
index 0eea24a6a1c7e6f40124ec4aaba865e724f634f1..db1f64f11b649df109b1e4e12c0074723a866077 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.106",
+      "ip": "172.18.64.106",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ad",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
index b017133b2bd000e929a828b0793cfb4ef0dc9168..ed8c6d87da4fbf605ead5117dd041007657b8fc1 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.107",
+      "ip": "172.18.64.107",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:3d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
index 04262138b225fa278d09692429e5a28218c1c43c..fc4c80eefcf46c41caa6c923a013976c55a97049 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.108",
+      "ip": "172.18.64.108",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:21",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
index 37f46a8d5bdd424bfc8c9473d8c075f00b8c7177..39e5e71f751f7841ed42267513f55ff5812f6d1a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.109",
+      "ip": "172.18.64.109",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:25",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
index b9e049484d3526f520320d1cac00f601b41d736e..e446fccbd9dbf4aa80a5296c862023a526af8b35 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.11",
+      "ip": "172.18.64.11",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:71",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
index b3e5e035db7323d5813b109c9b6af299a8a5ae10..c30aec1883df702b16580216f66f3c6f99dd4dfd 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.110",
+      "ip": "172.18.64.110",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:a9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
index 1f0e80b569f47b38e9e7a98d4073c377edcac16c..c1359ad6e720504e02625f06c770482906c903eb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.111",
+      "ip": "172.18.64.111",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:000c:559:1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
index bedbbb2080526ec4b606651e78de58a60745144d..361dfec729f6575cf64a3382cf9c120cdc6f61a9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.112",
+      "ip": "172.18.64.112",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:7e:9d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
index a278a7ecede777805df4281c7f84b231c07ff1ab..714cc60e1632cd32f1f43d9b1ab65e5a92c8d2da 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.113",
+      "ip": "172.18.64.113",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
index c616b0d85ae2e9ed884c71e87d4ad86a97354cb9..bdddad19cf69ccb753284443daa4262bc01c15e5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.114",
+      "ip": "172.18.64.114",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
index 0ccf07d1afd2c72dde31b7b1ce3c34b5360b1d3a..56f339ef848b486c8e71d721968274d5a77adf16 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.115",
+      "ip": "172.18.64.115",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:05",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
index b4d16246b19f8b0b30d06821661c2262ff452291..b0d7accece6b0697254444c17737979102a5abb1 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.116",
+      "ip": "172.18.64.116",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:1d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
index 741952dc32c1f76aa3b54e5895a905736b03ef5a..489371b8a9c9eabf9ff1485810df749a9e5d0266 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-117.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.117",
+      "ip": "172.18.64.117",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:25",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
index 368f13d7b43db59a7256568cc259937f3f60ba4e..69f4e5d6fe90f7731b3fae9bd96aec7da25dcff8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-118.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.118",
+      "ip": "172.18.64.118",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
index 189d3d71b0f3c2d78fb6d674ba12344819d05b22..f7da52537881d114c8298b8021bcaaac2cb15d4a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-119.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.119",
+      "ip": "172.18.64.119",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:19",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
index 028dd10ab8f8d8b42d17261032c769b091e2a33d..0204c9a64b2a84733e4e2b390a9078ec03327373 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-12.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.12",
+      "ip": "172.18.64.12",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:81",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
index 8f3b66d8c927c0ef058f1c88eceb06b257056bbc..4c69341a3a431a5e26866ab808a418d3cc67ee9e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-120.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.120",
+      "ip": "172.18.64.120",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:29",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
index 1d1f3fc67cea9277e520594b8ee281ecf5375da6..4d14887f7aa3e9d18007b9f43d0f6cf8f151aeee 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-121.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.121",
+      "ip": "172.18.64.121",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:2d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
index f22c0766cb163e04f1df7e2cb82bce19e1193496..a0c7294f78ff3b45d12ab104e1d73703aae81a9a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-122.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.122",
+      "ip": "172.18.64.122",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:85",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.json
index cef130080ca275b25ad2ec77f5745dbfd0f37449..8fea5d9e95f4810f0271976d35c60442193835c0 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-123.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.123",
+      "ip": "172.18.64.123",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:19",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
index 4e91508dd379ec7cfdc427139e5b582df535b2a8..ad7a9751cb237da28078b62be67ba27f7697d661 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-124.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.124",
+      "ip": "172.18.64.124",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:bd",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
index 051dac184985c70d1d93eca82255c121f291aa7e..71a2c65ad1bd0ff5b4c9d358f49e836da6c762c9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-125.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.125",
+      "ip": "172.18.64.125",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:91",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json
index 93c6be40546e53bd4d164571ad460a0e29e9b676..903e7430c078470b318590ddbf20a90ad617253b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-126.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.126",
+      "ip": "172.18.64.126",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:51",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json
index 35ca193cc57c5e648f916f9825dd3f86f76e573d..d2c6bf255f9f183f0d066a8243da5f61cc21e5ae 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-127.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.127",
+      "ip": "172.18.64.127",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:85",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
index 39e468ebbbaae882d33624d3567b091d651a1fb2..9e268c96091a37945071b730d8ea48e9674da3e7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-128.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.128",
+      "ip": "172.18.64.128",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:15",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
index 1d79093e3b114e7f20ab5ce66009a148a2db0d09..2774cf295a4c7cd64bb28987c3091911180a4606 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-129.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.129",
+      "ip": "172.18.64.129",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:05",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
index 6e2da35b86fb7c829bc7dd4675903a76c87f4df6..ba3f0fd79e26daf6103d3971cd1182267e4ce55e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-13.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.13",
+      "ip": "172.18.64.13",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:85",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
index 02291d1471ef5c4f5a24119765d881326ae23778..c907a00b42926b72e0df8ee9dc1ca1a3bff67fd1 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-130.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.130",
+      "ip": "172.18.64.130",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:09",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
index 14b196afa64693a45806b737a7c33564b5fe262c..8bdfcbcfb406c97909b8053a283ff82af3ca9737 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-131.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.131",
+      "ip": "172.18.64.131",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:11",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
index 2fd92030feae877c8b67b4b8bbc9267f938224cf..6d4e50809c2e1abaa91de90ed43f110fc72a0310 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-132.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.132",
+      "ip": "172.18.64.132",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:0d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
index e80e6fed7beddbd215945d8f45b8a8a74e57d25b..43f894f933f0e0082101e8403553125e0f1d688f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-133.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.133",
+      "ip": "172.18.64.133",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:05:f7:b3",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
index 87832cd02f6f1c27b0fdc13a6cd8fe67a68b1aa4..c794a858fc4d33994cfab65343ae6206bc16ada9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-134.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.134",
+      "ip": "172.18.64.134",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:05:f4:4f",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
index 8e8b5ee19deb75cc604f1acdc81bb5273b21be1b..a1158834cd1ee903ed449cf6572252bbdfcc7363 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-135.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.135",
+      "ip": "172.18.64.135",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c7",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
index 3ab9b6045c0ddba70ecc9534eab9b80c7c9729f1..233b5dcbe63ee0202313bd7096cd4247334293ce 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-136.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.136",
+      "ip": "172.18.64.136",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:05:f8:47",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
index 16cf20124e248a0925d8a37e5d9ab6f256efee2f..2b48a72f24592f8924f36eb5b8c97a7b9254330d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-137.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.137",
+      "ip": "172.18.64.137",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:05:f6:47",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
index 8803bb6607b3991bd393ff28081fd4498cebb7e7..e07feef5554fef8186f2f59c0410a5a6863d225d 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-138.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.138",
+      "ip": "172.18.64.138",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:05:f4:c3",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
index a5d460a14bff233ae11367a4ca5d336181e49db3..4dc718caae8f0be97cc544382d5cac513b6c439c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-139.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.139",
+      "ip": "172.18.64.139",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:05:f7:ff",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
index 010f3c1732e6aa9e43e16e9746110a2399f01349..834690c47a819dbd3b10b7caac8da013608e61e7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-14.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.14",
+      "ip": "172.18.64.14",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
index 866d7d6efa981d330e4792f93e3d4627744b5565..470a85b191e3596d6253272a061811aa2a3c6994 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-140.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.140",
+      "ip": "172.18.64.140",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:05:f7:9f",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json
index 2fa823c078b2e9c35fb054e46f4eee03d797c196..4ce3b175296eed6ccc9d48883a34ed40846e4937 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-141.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.141",
+      "ip": "172.18.64.141",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:05:f7:93",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
index c6c86dbca26e0794b182465c353eea85d093d224..fb65df22ecdaad17e81056ba58cedfe6b1f71750 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-142.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.142",
+      "ip": "172.18.64.142",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:05:f7:a7",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
index 1575cf3aa209b06959dc5efef9372299a24448b0..c1d14e9652acd841c97d81db36c95bac60af5906 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-143.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.143",
+      "ip": "172.18.64.143",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:05:f4:97",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.json
index 3120188ea4750eabd73a02859950d5e04fc37383..e6c37cfedcb2f6d5b732450f4f1f2eab73c68dcd 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-144.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.144",
+      "ip": "172.18.64.144",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:05:f8:5b",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
index fbbc54cac281e33b6aa290d6e8ee047d435d8307..059f9896c9e6cc6ac6246e8fa5878e1f18a0f114 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-15.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.15",
+      "ip": "172.18.64.15",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
index a0e53979c59d1cd14b1e3c57de22253533e6540d..a97b26a0d5915e94462aebfc764b038e70a79322 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-16.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.16",
+      "ip": "172.18.64.16",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:75",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
index 3f2ef1624a29d98afb4267fe4e544eabd9d54bb6..9576b3ba2c1a8443ccebe648e6cce151b6318ec5 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-17.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.17",
+      "ip": "172.18.64.17",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:71",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
index bcef3b263e74e25d8384fd7022ae60156c746299..1485abf6e172032cd3a8f7cbbe770d838adf8429 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-18.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.18",
+      "ip": "172.18.64.18",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:7d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
index bcc0ed5c9024d8a9bd16b7bfda5fb16b62c5a153..de994e4b3ef964bc7c529f710c706c51156cd895 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-19.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.19",
+      "ip": "172.18.64.19",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:55",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
index 4d610ca4a0762f18d6ef0405fbe4256feda9908a..7c64bc0d367948a26e8dc66d802c357a92e3b873 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-2.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.2",
+      "ip": "172.18.64.2",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
index 499613a551971d8338de6a7ad68278dacf26d35c..f4eef6fcf77ab09d56370fa8d39323936d29f0a9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-20.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.20",
+      "ip": "172.18.64.20",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:45",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
index ae75ff90d73747132639355abf982fc0667645a8..c69992454a6a65f118aa5624618ea1cba67ff628 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-21.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.21",
+      "ip": "172.18.64.21",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:0004:53:6d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
index 6eb9a67573f7b224dbb08db808966ca0f5dac3f9..74373ea7ba7aa688ae8074fc8944136899d23915 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-22.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.22",
+      "ip": "172.18.64.22",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:79",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
index 86425fe276ccf3c957afaf48b469e325d618c0c1..10293d05bab25b991977c424b9dda0751064b55e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-23.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.23",
+      "ip": "172.18.64.23",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:65",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
index d16a357470c9d5f0c8752ffcd36f8fc507a2f1d5..d98a1ab7393f7a0682c4ba83e173c5b275ac7128 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-24.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.24",
+      "ip": "172.18.64.24",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:cd",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
index 9936ca983adf98c245898f793f4cc978b22bd090..3239562e2f019b1cc0cd6a28ca2ebaabc217b1fd 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-25.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.25",
+      "ip": "172.18.64.25",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json
index 0b2b91475cf20bbd8a79cfc60e297495e825e122..0f1156a5fdac289a52a665fb9e46023981257bdb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-26.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.26",
+      "ip": "172.18.64.26",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:9d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
index 66857902c076b691f84cbccbe94679fa367f54b1..03ed4fa3e26ded620e15530b6b7fa2e41e4ab54c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-27.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.27",
+      "ip": "172.18.64.27",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:89",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json
index 9dbbdc8cdea65a7d4212a8fdba3ff7b4abbc4b83..0661a5c0deca37eaba9040ee64813cb3ecb7eb06 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-28.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.28",
+      "ip": "172.18.64.28",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:8d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
index 83cb9c1b01f2db37ad27500b2b3955acc4038b02..fd05756a84d149cd0a779f0825f6d4b1df31b735 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-29.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.29",
+      "ip": "172.18.64.29",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:90:dd",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.json
index 7898a7e9d39c02e7c1eeb58e91aa74abd05a6a35..c201b5d5fd7875a085ef7ae5d30c81d9ac704dcd 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-3.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.3",
+      "ip": "172.18.64.3",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:59",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
index b5bf351a7789db50d7ed2821cb031dabe996cb9d..45291179a9800e45dcb174b07b028f33dcbf2e26 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-30.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.30",
+      "ip": "172.18.64.30",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:79",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
index fbbf0a480a69d0dad4c629e56fbd79f8d3ec572a..29d5212655a8d35c7a1832901e924de16427edc7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-31.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.31",
+      "ip": "172.18.64.31",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:1d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
index 7d2f88d0c41c4e299f3f3f53a055123d7488e20c..25f3424930067647d552e49609a9b80d84cf2cee 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-32.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.32",
+      "ip": "172.18.64.32",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:7d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
index 5703068142da5a77242150d430861ce8bf71bf22..7091de61cdccf0e22b977b4f91825ba348dee9d4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-33.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.33",
+      "ip": "172.18.64.33",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:90:d9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
index d8d509d3a216a9ccd3fa57892684a38bc85dfe38..dbc3b6177e5c43c159b93a5959c3780cd693fb7e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-34.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.34",
+      "ip": "172.18.64.34",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:65",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
index 2b8ae285304df3ff07aa454278a6469ccfb67cf7..807b30703a18fdcb8d641486b35106a444fe1193 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-35.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.35",
+      "ip": "172.18.64.35",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.json
index 5ca958ff58adacdfe42df3308972738bfb656a45..24eb48cf2b14276630dd7989d3d5074a275b3f68 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-36.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.36",
+      "ip": "172.18.64.36",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
index c809db234713e4c8d56b329ddcf75cf71a2c35c5..bbfd6a65cb61d9d675a6c7b7c120e702238c9ebd 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-37.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.37",
+      "ip": "172.18.64.37",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
index 633415916ef42c6a7b7bcbb0c33d9fb5b71ef045..cbc7cd052eafe4225cccfb9cd1e457435ea5ef79 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-38.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.38",
+      "ip": "172.18.64.38",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json
index 7ea6b9364402629b712f6b7887b44cf9690951ac..7b6d95b286d84fe9d934e3c6fe5263794d9313d9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-39.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.39",
+      "ip": "172.18.64.39",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:c1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
index 5cc14882d0dbaf1719215fb028049dceb2970926..6319b5bfa74c70ce73ecec4d88fe5b84d0afff5b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-4.json
@@ -20,7 +20,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.64.4",
-      "mac": "00:e0:81:d5:06:f8",
+      "mac": "00:e0:81:d5:08:54",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -34,7 +34,7 @@
     {
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:e0:81:d5:06:f9",
+      "mac": "00:e0:81:d5:08:55",
       "rate": 1000000000,
       "vendor": "intel",
       "version": "82574L"
@@ -42,7 +42,7 @@
     {
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:e0:81:d5:06:fa",
+      "mac": "00:e0:81:d5:08:56",
       "rate": 1000000000,
       "vendor": "intel",
       "version": "82574L"
@@ -52,8 +52,8 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.4",
-      "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4d",
+      "ip": "172.18.64.4",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:bd",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -66,7 +66,7 @@
     {
       "enabled": false,
       "interface": "InfiniBand",
-      "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4e",
+      "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:be",
       "rate": 20000000000,
       "vendor": "Mellanox",
       "version": "MT26418"
@@ -76,7 +76,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.64.4",
-      "mac": "00:e0:81:d5:06:fb",
+      "mac": "00:e0:81:d5:08:57",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -111,7 +111,7 @@
     "vendor": "Intel",
     "version": "X3440"
   },
-  "serial": 1009390006,
+  "serial": "1009390096b",
   "storage_devices": [
     {
       "device": "sda",
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json
index 7850dffc8eb8b82da72305a9385480e9dbf306d8..c06ecf09a7612db926d02d44a541ff5d5cf32532 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-40.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.40",
+      "ip": "172.18.64.40",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:93:cd",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
index f21dd3c72144fed82a1c7c88b13f4e113706c995..ddf125595f8022a61f869a89d9db0a3d3c0e3d82 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-41.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.41",
+      "ip": "172.18.64.41",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:99",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
index 4a332055863a462ddbea8346ee6285e988fa57c1..9dbcdcde3ac31ec3211ae38a8042aa35bdcf2b0a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-42.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.42",
+      "ip": "172.18.64.42",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
index 07f137885c46e4cc141c0f9a0a1790008bbea12c..85ecfab45d4b669dc59a43a95551baa6660cad19 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-43.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.43",
+      "ip": "172.18.64.43",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ad",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json
index 22d89744b22fe355ebcde6f5126c3ce484606c98..aa213a99eb7dac9f9bcc418018a08a4748c92998 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-44.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.44",
+      "ip": "172.18.64.44",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:b5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
index b5fddc829c2b261d7c7f36d3c8be9a248014b8d1..1b2cf050c35a98837ce4121b00fa10ca0e7508ae 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-45.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.45",
+      "ip": "172.18.64.45",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:21",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
index 95f73a34ac79525ff5bfd8472449e9517c3c9a01..b35e8bea19d5f5860798616cd4712a828e23435b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-46.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.46",
+      "ip": "172.18.64.46",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
index 6ec5bec815a3b72cece21d5d3cb254679c1c9cdb..98e47e7ec890cd91042c644596ecf77987804aa6 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-47.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.47",
+      "ip": "172.18.64.47",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:e5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
index 3b6d63e7c89d8fcf812acf95906e93ca88278888..45df4fdb6131063221aacd5fd5a4916f15d1b534 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-48.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.48",
+      "ip": "172.18.64.48",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:dd",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
index c346bc0ba500b8767abfdd0fa911a3038e2b6368..9ac26030b711f79963a31d4bc924f345dd1c049e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-49.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.49",
+      "ip": "172.18.64.49",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
index 58d069dd7682c4fb630e64049d250f7f69a1a656..3f90106ac6f5e7df451b57daae01766d304d63a4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-5.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.5",
+      "ip": "172.18.64.5",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:79",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json
index 78105d43c7befb8c6a9cd0c7a7f9909b0c533375..611991e64d340a291aedd4c847ca7bc5ba34bb97 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-50.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.50",
+      "ip": "172.18.64.50",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
index e75e7281ed8c62675326e94cb51afec30cabe46e..5c053c1c428f25a1fbb988c20b243417b2119f96 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-51.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.51",
+      "ip": "172.18.64.51",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
index 739fb1636f2bffb66bf9e01f97e957c70e638bf9..18161d10434088e450ac52c150b7a54fa072f8db 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-52.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.52",
+      "ip": "172.18.64.52",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
index 400e194255d9eb0f02f336d506ac8277ba9fec9c..45e0fb7d7f56d28b4aee42a97874f2a80e79ccfa 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-53.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.53",
+      "ip": "172.18.64.53",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:09",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json
index a7ef15f7ee907f0bea19f220cb2441fa43d30b24..a3d8cd379e7dc662f2ad1986abdacf3cc73e8490 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-54.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.54",
+      "ip": "172.18.64.54",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:15",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
index 6a963803e728f6877ea335e4e905abe24a5a67fc..1140ebc462e852afa93134e07e48927e84453107 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-55.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.55",
+      "ip": "172.18.64.55",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:0d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.json
index ad20b763d2d0f3b8840b5d8202a35ba7d86ced59..f3b235829a4cd9451402b281fd4b37e7f2514e9e 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-56.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.56",
+      "ip": "172.18.64.56",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:89",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
index b78eb3c95bdc8b6372142a575d5cabbaa8179518..a2fc736e79d7e56b127836cd540ba2999f36894f 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-57.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.57",
+      "ip": "172.18.64.57",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:8d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
index 9658beb3efa70881c4d3d0a7c7b1353fb3250e84..f02d17933ad69549f9fc442b795e47f8bade3fbc 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-58.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.58",
+      "ip": "172.18.64.58",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:9d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
index 05b09f239dd3fdb595eb19e14f13f79aa14645bb..00f9dd3dcc5e5e266d0cd0ec9a4aa8517bed50ae 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-59.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.59",
+      "ip": "172.18.64.59",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:95",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
index 8322974a0ceda78b371729c06037995634d5a0a0..992489437d71b74cab3d3321704ccebe82ff290b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-6.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.6",
+      "ip": "172.18.64.6",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:7d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
index 213cbcb2e2ce05549a9385f96a6f97e1ecb3ed91..4320b64f9567e301dcbc1f19c7c6eb49c4e3574c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-60.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.60",
+      "ip": "172.18.64.60",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:85",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json
index a33a1452d044a4b7b1127754cd472d0f751c62ab..70e253c6519fd44f7ade760cf23274b50bf010d3 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-61.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.61",
+      "ip": "172.18.64.61",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:91",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
index ce09c16f884608441b09b48b773e4d4aac27261e..20b29fd41e46f4d71153939012eb149a4c71ff65 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-62.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.62",
+      "ip": "172.18.64.62",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:99",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
index 8639cc2a56fbdcb90d2e628d705dab57b9304094..ce54af5af649bb1d079df3fc9cc309d93ac3e018 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-63.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.63",
+      "ip": "172.18.64.63",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:81",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
index 5989db099cf3475f5cbbf69b45696133c628d69f..949853fb03be35f1781c22ead60d9f42745aaac8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-64.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.64",
+      "ip": "172.18.64.64",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:a1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
index 046dd41695241d1a368a9c632b4c2a14f2165155..0c6f2344045439006a1117cdac2ba206469e3f7c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-65.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.65",
+      "ip": "172.18.64.65",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:d9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
index 52ba981ecf8e363af2f29d2c81558c8b00e0991c..ee04516757eebcbfbe40d7f6d652546ac1c2b73a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-66.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.66",
+      "ip": "172.18.64.66",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:49",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
index 73b94f8a90a957493ada433176e946c428bf584c..dc26fe88a374dd8d53d7dc9f101bc73c25af61e4 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-67.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.67",
+      "ip": "172.18.64.67",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
index 3d15dcd97db6efe250dc5f2e59c383ac2076a356..08c9552cdcfb2a5005cf9775fde5c277f0794801 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-68.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.68",
+      "ip": "172.18.64.68",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:91",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
index 2431b3ce5b7b13e3309b6c3741e8c8bbcdefdaaa..20257271798532622d60cfe4ffa585c472ef5eb9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-69.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.69",
+      "ip": "172.18.64.69",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:c1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
index 5a39334dcd1ecb97e931272cc225890d7728ce88..d83bd4b96d1aefc729df3bf901e3ada05e0a8ae2 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-7.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.7",
+      "ip": "172.18.64.7",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:61",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
index 754037ab92ee9966242e2f2c0b7eb278a8656494..d6a05954522af5fa2d6e2f73db482f2c447c808b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-70.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.70",
+      "ip": "172.18.64.70",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:11",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
index 46c6bfc50ec1407f5347756b99149ec93b019947..2ba4508641ec3cac3dc0c3086895c3ab127a7432 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-71.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.71",
+      "ip": "172.18.64.71",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:ed",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
index ab4f9db9448affc542cad52fc8e78c61f571c275..944860bde2e964d9d5fdffd2fceed39e3b69e553 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-72.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.72",
+      "ip": "172.18.64.72",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:95",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
index 4ce52598585b0e3ec978d1225b06400284ab2a8a..beb092c916949c9600df539c4acb852416b43cbb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-73.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.73",
+      "ip": "172.18.64.73",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:fd",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
index 3f383f2507136d2e1e1bfb715a4d85547cde3541..56363b136a5bbc7fdf0b418d1e8004b1bbb74bc9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-74.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.74",
+      "ip": "172.18.64.74",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:dd",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
index 41a084d7a4a16825d48d7ea1612c4a7be2b82722..2414138f7b44c7605363ae1cfbe9de62c23ba1fc 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-75.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.75",
+      "ip": "172.18.64.75",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
index 7b8cd17ec5fb5371287fa419d32914d73d294fc3..b2ff4ef4b8dadd967f0806bc2cdcf399a15f969b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-76.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.76",
+      "ip": "172.18.64.76",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
index c77ac020d4ec1909a4acecd43ff30f4e077418ad..62f83ad3a4d5bd9c814d83037a84917cb415e309 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-77.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.77",
+      "ip": "172.18.64.77",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:e1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
index 4215f966642dcda78d55fb184f7acedd9a665eaa..c36ba4fa520e65fc0c7e6df14d5db2226a2dc1ab 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-78.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.78",
+      "ip": "172.18.64.78",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:01",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
index 33375143f3de078f5a281bcc113b822530d5ddb5..31dafab520dee281fefe66945daa72fa03c09410 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-79.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.79",
+      "ip": "172.18.64.79",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:f5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
index 71a26a10656d8ff01b91e8606ab3eac65fc9d425..e183740e503bcb1c7b233b67a2ca38631511bf4a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-8.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.8",
+      "ip": "172.18.64.8",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:75",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
index 5fd540b7b529f5aff86a7d7f39990168afee97a0..a20c04f7885e50679f6a0bc32679578636616e0c 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-80.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.80",
+      "ip": "172.18.64.80",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:92:d1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
index 0e24aaf8e689f193cfa40bcef90eea4c2b50af93..6b1e1b46b979476791864a52ca3674adba61a45b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-81.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.81",
+      "ip": "172.18.64.81",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
index 083a1522d4b88869e69cc87749a89a832b35ca0c..505aa38dbb453d0e0dbea6a669c0c3b0cecc8abf 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-82.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.82",
+      "ip": "172.18.64.82",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:95",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json
index 26f16f77010979708910f1036f43379ce99609f1..2984e72fcd89d1748c457b073d742f8d360052e8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-83.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.83",
+      "ip": "172.18.64.83",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
index 25a0b8b00d95d444967baa12faff970c7ce9f54d..a4691fc1cbfad207658e793329b2ffb76d54b8a8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-84.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.84",
+      "ip": "172.18.64.84",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:9d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
index 4937ef96aa10595b5977f22eddf8302c44d49756..069018b0a7f1b60f5b7bbaae1f4337ee440a07e7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-85.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.85",
+      "ip": "172.18.64.85",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:99",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json
index a292db96fb1ede20c0506ada087547fe308a7c6d..b739625f2b656bd01cb21e7fbc0c2b381ffe336a 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-86.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.86",
+      "ip": "172.18.64.86",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:a1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
index 39f56bc8b6be0a0b3ef4e92e098033d2dbdf4348..28f1cf19aa717f0a863377ac81c5ca63c81cb552 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-87.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.87",
+      "ip": "172.18.64.87",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:ad",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
index 53b9643841c21602347cee0adec59fd72a608f19..d6f700110cada0ad8678c3a7a95767c68f89a236 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-88.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.88",
+      "ip": "172.18.64.88",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:93:b1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
index da70b2e7aa64eeeb8c2c0114d20e21b75ba4856a..09c06229833e5d52c183274f5df9703a2630dc38 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-89.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.89",
+      "ip": "172.18.64.89",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:ed",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
index d0cab40f6288f44edef2314138e27e55548ee51c..4dbdb902e5ada4399db3f89dfdff08ecadb2ea13 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-9.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.9",
+      "ip": "172.18.64.9",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:69",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
index 944276098278798c605c2eeb924893772b64ed44..b41d4da5ccb29016c32ac886d97251272e8be8d9 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-90.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.90",
+      "ip": "172.18.64.90",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5d:09",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json
index a5036c7c3ea91d2afc1bd69bb5724c5541a96853..5813ea2089d69d712611e5f10a1452db3eaf76e6 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-91.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.91",
+      "ip": "172.18.64.91",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:d1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
index 6e5b2a5341f371a7e4ebe1f460b939506fba5382..e68fdf3fb5c2c858742475bf85834a50c9ddecbb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-92.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.92",
+      "ip": "172.18.64.92",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:e5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
index 928791485e41b69b3c5d203a09f30a85342baab7..5b8fd9fba1bd01d99be5eba2b2647fa7e5ec18ed 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-93.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.93",
+      "ip": "172.18.64.93",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:ad",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.json
index faf2f2fa7d262c3d8ed2f1f72aaa0ed9dfa97c72..08d4c97d14af7f181a4e10b2d174018f6f4ebedb 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-94.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.94",
+      "ip": "172.18.64.94",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5c:95",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
index 9212ae27f394d8a4c0b11c08c4dcc19f84ac75d0..0a16c7803fbbc4f4c411e463bf4dac906b1bafb8 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-95.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.95",
+      "ip": "172.18.64.95",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:95",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.json
index 4e23dc01e2103d6d61e6de076db9bf0047abbf38..641effac87917a47efe8d2f3d729040cdc3c0394 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-96.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.96",
+      "ip": "172.18.64.96",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:9d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
index 6ef6b85d4dddef0880333a574bacf5573a1a1ebd..37d60976b0cb43a7fa00dba78deca6e5cee6bc0b 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-97.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.97",
+      "ip": "172.18.64.97",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:d5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.json
index 496334abf115f0a4f98e393c1004c0b0ab703bdb..61a66eb2739bfb8609bd3993384336e479f740fc 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-98.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.98",
+      "ip": "172.18.64.98",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:99",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
index 6a01fcfa1a429ebcae507763b0b02c17fdea6a7c..0842d769037ec87f9b75e64178d40d7be19767d7 100644
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-99.json
@@ -52,7 +52,7 @@
       "driver": "mlx4_core",
       "enabled": true,
       "interface": "InfiniBand",
-      "ip": "172.16.66.99",
+      "ip": "172.18.64.99",
       "mac": "20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:5e:b1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
index f5c5f1010ee034aa17129afc9c943b9827947e2f..da9121113bee0e6a4f69d71f58a5bb65bd395138 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003106",
       "ib_switch_card_pos": "1",
       "interface": "InfiniBand",
-      "ip": "172.16.67.1",
+      "ip": "172.18.65.1",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:f1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
index 746d854db3620d02c794f794bba1161ca0411635..3852bb3b79619c542bf9ce71ca01b290c8ab3edc 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003106",
       "ib_switch_card_pos": "10",
       "interface": "InfiniBand",
-      "ip": "172.16.67.10",
+      "ip": "172.18.65.10",
       "mac": "",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
index 4829a2956f640b689dfe7d5ea542fadf143da7b4..3bca221f98a072fd39c2d675ca2ee808e3673826 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003106",
       "ib_switch_card_pos": "11",
       "interface": "InfiniBand",
-      "ip": "172.16.67.11",
+      "ip": "172.18.65.11",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
index b98d5485930af0edea2827455392d630dad5e38d..9758139485323c2abd850c1aa4d097d00b396db8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003106",
       "ib_switch_card_pos": "12",
       "interface": "InfiniBand",
-      "ip": "172.16.67.12",
+      "ip": "172.18.65.12",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:dd",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
index 1b040b02c331089ec7df05ed6ee8dfc485ac0716..804060558a9ecaf985b65a16aed90989b6a4c35d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003054",
       "ib_switch_card_pos": "1",
       "interface": "InfiniBand",
-      "ip": "172.16.67.13",
+      "ip": "172.18.65.13",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:bd",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
index 23905f18c5f11eb15ee225404c6926a8c1f06047..2e6bad063cb048ac8e4d5a83945dbce3692d6b30 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003054",
       "ib_switch_card_pos": "2",
       "interface": "InfiniBand",
-      "ip": "172.16.67.14",
+      "ip": "172.18.65.14",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:cd",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
index 5bed4887de91f67107584d9a8107a7242cc018d8..94be6deb25163ea27e055ceec429770911982c52 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003054",
       "ib_switch_card_pos": "3",
       "interface": "InfiniBand",
-      "ip": "172.16.67.15",
+      "ip": "172.18.65.15",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
index 85e530da4a0678452fcdf5c895d3c76260953fda..17ec8fd9fbd3dbd69411b8b157835033fdbf414d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003054",
       "ib_switch_card_pos": "4",
       "interface": "InfiniBand",
-      "ip": "172.16.67.16",
+      "ip": "172.18.65.16",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:3f",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
index 1c7e7a9e07b1393e23506b264f1bfb0d6c64ca9b..bcbbf3ca0d52493282da7ce7f96272c29be381f2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003054",
       "ib_switch_card_pos": "5",
       "interface": "InfiniBand",
-      "ip": "172.16.67.17",
+      "ip": "172.18.65.17",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:17",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
index 644645b458f526c87a829c4ad6b5519a4ccdc393..5c84cf8b52aa40d3e703fd2cd378573df170de15 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003054",
       "ib_switch_card_pos": "6",
       "interface": "InfiniBand",
-      "ip": "172.16.67.18",
+      "ip": "172.18.65.18",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2b",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
index 278c0801305f4a36dd4d5466b4977ecb9a426926..88ee9f3bdf7c9064b9489eec9ba039df21f18c3a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003054",
       "ib_switch_card_pos": "7",
       "interface": "InfiniBand",
-      "ip": "172.16.67.19",
+      "ip": "172.18.65.19",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:37",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
index ced0993fcbdadfbbfe431843858366d4380e9bc0..e97d37b65e453418d07f9fbed5cf7097e2cb2345 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003106",
       "ib_switch_card_pos": "2",
       "interface": "InfiniBand",
-      "ip": "172.16.67.2",
+      "ip": "172.18.65.2",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:65",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
index 7c0bc13610c8ed098abe874afb46170d44abf559..08bb605b711e4d2e0e88ffef4c696dcd2c3642a8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003101",
       "ib_switch_card_pos": "2",
       "interface": "InfiniBand",
-      "ip": "172.16.67.20",
+      "ip": "172.18.65.20",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:cb",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
index 59b74cd36e843bb263920c2e7356ac6213343d7d..84e5a410162fa18f1dd33002f60ac6545e34a729 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003101",
       "ib_switch_card_pos": "1",
       "interface": "InfiniBand",
-      "ip": "172.16.67.21",
+      "ip": "172.18.65.21",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4f",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
index 8275bbf2b35b5bd9bee162f313840f4753953bd4..8810a2f90a77fd69054c001891316c494fc9f913 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003101",
       "ib_switch_card_pos": "3",
       "interface": "InfiniBand",
-      "ip": "172.16.67.22",
+      "ip": "172.18.65.22",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:33",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
index 4323dd3e67e07d6413cc4d0e1c00ae4fafa59547..bc4f80b4fde6b425c4d4263b47c8fbc01179fdfa 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003101",
       "ib_switch_card_pos": "4",
       "interface": "InfiniBand",
-      "ip": "172.16.67.23",
+      "ip": "172.18.65.23",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2f",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
index cfe37bab2eff08c6ca2ad165eeb27b5c2f9eae0a..f4f09b049e59c2fdcfbf422437d83b9ccbc0b205 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003101",
       "ib_switch_card_pos": "5",
       "interface": "InfiniBand",
-      "ip": "172.16.67.24",
+      "ip": "172.18.65.24",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d7",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
index becf502fd363e88c399ed34eae9ed2ebb310491c..5ddf0ebfeadbec28e952d1dac823db6af56ce6d6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003101",
       "ib_switch_card_pos": "6",
       "interface": "InfiniBand",
-      "ip": "172.16.67.25",
+      "ip": "172.18.65.25",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:23",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
index 423550b74995589fc4b9ef7ee5d5d728614efc50..9b251e7f8fcbffe6074e17e367993bb336f3b366 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003101",
       "ib_switch_card_pos": "7",
       "interface": "InfiniBand",
-      "ip": "172.16.67.26",
+      "ip": "172.18.65.26",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d3",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
index e516e0b1225dc28d2ee8855b8547ab8be864b687..723425fc4f0b51009adf370610c097de2ec303e1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003101",
       "ib_switch_card_pos": "8",
       "interface": "InfiniBand",
-      "ip": "172.16.67.27",
+      "ip": "172.18.65.27",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:1f",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
index 2c1b74b1eaa681d31a53e298c8992daaefc116ba..4f01c818917f78dd856c441ac6c57b9421687f16 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003101",
       "ib_switch_card_pos": "9",
       "interface": "InfiniBand",
-      "ip": "172.16.67.28",
+      "ip": "172.18.65.28",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:db",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
index e80d0c0460440badec0143fe278b39350dd6f482..ab637034954eb75d77044ea0d22db8004540fc47 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
@@ -20,7 +20,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.29",
-      "mac": "00:E0:81:B2:C4:BO",
+      "mac": "00:E0:81:B2:C4:B0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003101",
       "ib_switch_card_pos": "10",
       "interface": "InfiniBand",
-      "ip": "172.16.67.29",
+      "ip": "172.18.65.29",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:43",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
index f01e5aff36b4267e22ab44cadc0d41c55606c062..f4ecc3792654ef1d2505731a680baa9ee146cca8 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003106",
       "ib_switch_card_pos": "3",
       "interface": "InfiniBand",
-      "ip": "172.16.67.3",
+      "ip": "172.18.65.3",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:61",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
index 6de491752ee3a93ce40042a25b0a3334238f17ba..ee81570aae651c3a9fc5890d7410496f65391013 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003055",
       "ib_switch_card_pos": "1",
       "interface": "InfiniBand",
-      "ip": "172.16.67.30",
+      "ip": "172.18.65.30",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:3b",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
index 30565367817e28349aa6e837c44c87758d2cb1c6..e2afb9231135c620b7480cbc34ded5771a9c7f42 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003055",
       "ib_switch_card_pos": "2",
       "interface": "InfiniBand",
-      "ip": "172.16.67.31",
+      "ip": "172.18.65.31",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:5f",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
index 9c03f106f02574ea0eb8e1626f31764e824d6b29..334d860f2c147a4fc02cb02113850166c2fe6099 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003055",
       "ib_switch_card_pos": "3",
       "interface": "InfiniBand",
-      "ip": "172.16.67.32",
+      "ip": "172.18.65.32",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:5b",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
index bb1e09182294fe53c5b9d223b09d9bccb2e7cf60..e061d06675d9674ee9baa49dfafc4de18304f7af 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003055",
       "ib_switch_card_pos": "4",
       "interface": "InfiniBand",
-      "ip": "172.16.67.33",
+      "ip": "172.18.65.33",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:57",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
index 17d5db9d55997562859164890a6d48edd8814ece..5489016be4f4028319195b8bb766c14fdd8a8068 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003055",
       "ib_switch_card_pos": "5",
       "interface": "InfiniBand",
-      "ip": "172.16.67.34",
+      "ip": "172.18.65.34",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:53",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
index 0fdde58e04680853290af2feee892144ac40e4d2..518bd67a0c0055d761a482c120521baee5252524 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003055",
       "ib_switch_card_pos": "6",
       "interface": "InfiniBand",
-      "ip": "172.16.67.35",
+      "ip": "172.18.65.35",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4b",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
index 15afdb85a904145d86f8687698a48ddcb6cc5f4d..07a7f4b6a8d791143e8eb8d7199b5d2b39e45d6d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003055",
       "ib_switch_card_pos": "1/0/7",
       "interface": "InfiniBand",
-      "ip": "172.16.67.36",
+      "ip": "172.18.65.36",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:1b",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
index c7d6288cae44f92210dddd74a240afe2e9d44505..62472520cb4a6ca742080e9a64963e0428ccf1ec 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003055",
       "ib_switch_card_pos": "8",
       "interface": "InfiniBand",
-      "ip": "172.16.67.37",
+      "ip": "172.18.65.37",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:59",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
index a66d0e8eba2fcfffe586b8b4f5f4b7e2e81b114f..d927731e0db0cee8f5d3ba076a42632431cfaeae 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003055",
       "ib_switch_card_pos": "9",
       "interface": "InfiniBand",
-      "ip": "172.16.67.38",
+      "ip": "172.18.65.38",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:dd",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
index 83bd2c9ae0d6d9155689f8be6f18a0d5de35193e..d0d3b85b920332b67d2b47ddcf9b274153f2e686 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003055",
       "ib_switch_card_pos": "10",
       "interface": "InfiniBand",
-      "ip": "172.16.67.39",
+      "ip": "172.18.65.39",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:e9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
index 9f7965f9ac2e68baac18696d8c4b4dd59b096d28..2ece27ac615e0f9e62549d8bcfe3ad6b3077e601 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003106",
       "ib_switch_card_pos": "4",
       "interface": "InfiniBand",
-      "ip": "172.16.67.4",
+      "ip": "172.18.65.4",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:69",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
index 38ecbcc5f062dd4916a1bedce05c9c3f95d1686e..c8e4281afc2c96131a78b9b85433bd4dd15bf70e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003055",
       "ib_switch_card_pos": "11",
       "interface": "InfiniBand",
-      "ip": "172.16.67.40",
+      "ip": "172.18.65.40",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:81",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
index 3f8ebe0e3eb07baa40365cbb63247716e990e887..e92cde4db39d7b252731b4bda5a22f1966f90a9e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003055",
       "ib_switch_card_pos": "12",
       "interface": "InfiniBand",
-      "ip": "172.16.67.41",
+      "ip": "172.18.65.41",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:d5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
index 72279675c9d4f8ccd3b7879f83f4f8f7b98c533b..32f0a48d2a2c6ceed26cff7e3f89d16507ad7bc3 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff0030ff",
       "ib_switch_card_pos": "1",
       "interface": "InfiniBand",
-      "ip": "172.16.67.42",
+      "ip": "172.18.65.42",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
index 0f649a9e756350a60e8362b1120f5da68a89ab4e..133d808954d0a9917253f9824a1e54a9eecf171e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff0030ff",
       "ib_switch_card_pos": "2",
       "interface": "InfiniBand",
-      "ip": "172.16.67.43",
+      "ip": "172.18.65.43",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
index 3f8c657b3986878443c39a3d6289410f97ff5028..c8012fc4af91acc45fca9cacf6df8d7d345a23bc 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff0030ff",
       "ib_switch_card_pos": "3",
       "interface": "InfiniBand",
-      "ip": "172.16.67.44",
+      "ip": "172.18.65.44",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
index 7b9448b4c44ca93ba34ae4356ca87509f073703d..26451beebe8531f735ba4028408aef093b355406 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff0030ff",
       "ib_switch_card_pos": "4",
       "interface": "InfiniBand",
-      "ip": "172.16.67.45",
+      "ip": "172.18.65.45",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
index 41e0edb56cbb13831fb872c614167f807535ce83..0c8ed07f64d7ecba1e18df6de32fea702ef30fe6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff0030ff",
       "ib_switch_card_pos": "5",
       "interface": "InfiniBand",
-      "ip": "172.16.67.46",
+      "ip": "172.18.65.46",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:a9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
index c23e802adda131624b5422c9d512dde4e760500d..d9838f3a9e46715dd6bdefb653c2ee85c06eec64 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.47",
+      "ip": "172.18.65.47",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:e1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
index 04a52159a204cc28a3c316489848705f541eab24..e30451b5dad7893965bf377758b222897009a468 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff0030ff",
       "ib_switch_card_pos": "7",
       "interface": "InfiniBand",
-      "ip": "172.16.67.48",
+      "ip": "172.18.65.48",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:a5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
index 84b35fb07bb8274d904a0eb58e48e39215974841..d4826c4a55d8064b6fc5b01ba73046cfbd02f5ec 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff0030ff",
       "ib_switch_card_pos": "8",
       "interface": "InfiniBand",
-      "ip": "172.16.67.49",
+      "ip": "172.18.65.49",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:27",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
index 19a9f45a205682b785d092da5b42f102dae9fe20..16ae7bb270dd734aae088979201ab155f1f58caa 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003106",
       "ib_switch_card_pos": "5",
       "interface": "InfiniBand",
-      "ip": "172.16.67.5",
+      "ip": "172.18.65.5",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
index 59f140e25f3b88527045a1d40cb264797625c9a3..acab2ecd3078da62ff5a2925fd4c8c0a7a7cb84f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff0030ff",
       "ib_switch_card_pos": "9",
       "interface": "InfiniBand",
-      "ip": "172.16.67.50",
+      "ip": "172.18.65.50",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:d1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
index 550603754e8a70cbaa85c59ad37a58c38a579ec6..9429744580b2726a68e302c8efa88616bea98bda 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff0030ff",
       "ib_switch_card_pos": "10",
       "interface": "InfiniBand",
-      "ip": "172.16.67.51",
+      "ip": "172.18.65.51",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ed",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
index ab37653758a57117248044b59204dfc2b3f509b3..171a9fe415944adb55c0d1dc6924c704f57c981c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.52",
+      "ip": "172.18.65.52",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:85",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
index 3f22fcbd751693d1ccce22281ac7ab133ea217e9..334ab7445cd5ba93e45cfef5b9e6590385a5c4e0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.53",
+      "ip": "172.18.65.53",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
index b51ae64655cf02094757dbd20df4ab5129e27f97..2c0d6d54d0dd939c2a2ab137e3948c5bbf87ea0c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.54",
+      "ip": "172.18.65.54",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:52:05",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
index be8bafcab82e0193bfdbdd21ba6f1fb69c7489b8..439e5adff59c76a32fbcf9016f1c99132a125bdd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.55",
+      "ip": "172.18.65.55",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:85",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
index 820b0a66037c8b60dae32cb47491ec0dc5a93103..55d070fdd17e032c05792f8b6ce37ae55ecc0656 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.56",
+      "ip": "172.18.65.56",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:6d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
index 3f077439bf2127c52a63622504124c3486386988..b909648da0936cfc5c0d8d79b6f83503d2354d57 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.57",
+      "ip": "172.18.65.57",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:3d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
index 5606ceb64c80720f64bcebfbbdef7fec8ba427b9..a3cd1b92b87f9b24977de1b7ebb210f45f8b1cdf 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.58",
+      "ip": "172.18.65.58",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:9d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
index 2de805046f173934b0a7e379c9f30f912270e12b..0919922f9eba60ab558d7529aac961d557b803d5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff00304d",
       "ib_switch_card_pos": "5",
       "interface": "InfiniBand",
-      "ip": "172.16.67.59",
+      "ip": "172.18.65.59",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:31",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
index 18d04cd4af2775ccd50d5648b3f00c423bedf0c3..8bb1da187c76efe91753ebf08eedcbf3d985708d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003106",
       "ib_switch_card_pos": "6",
       "interface": "InfiniBand",
-      "ip": "172.16.67.6",
+      "ip": "172.18.65.6",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ad",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
index 0f1cb85fa9400813d7d9d0ab2f1cf05a845aad66..c823f4bcaf36c74023d053145966a8c2e35bf96a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff00304d",
       "ib_switch_card_pos": "6",
       "interface": "InfiniBand",
-      "ip": "172.16.67.60",
+      "ip": "172.18.65.60",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:41",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
index 51cbc0b4354613e2b0454afae760a5c35122762b..ffb6f14fb579ccfd860f57a8eac8cde938a87909 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff00304d",
       "ib_switch_card_pos": "7",
       "interface": "InfiniBand",
-      "ip": "172.16.67.61",
+      "ip": "172.18.65.61",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:05",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
index 0634e3834c99d45990d4a28f37411772949c3f7d..69986b8dba8375fb9e5b0aaa60f3c456b6018f77 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff00304d",
       "ib_switch_card_pos": "8",
       "interface": "InfiniBand",
-      "ip": "172.16.67.62",
+      "ip": "172.18.65.62",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:5d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
index 18d68d6ad8838731e10844c2995e42628e8d4c16..7d09a92651664f742ff9b3b47108b3fc1c126039 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff00304d",
       "ib_switch_card_pos": "9",
       "interface": "InfiniBand",
-      "ip": "172.16.67.63",
+      "ip": "172.18.65.63",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
index bdf84b3e289fbb7fade34180ed93eabcecbd4bed..853b3faf3c55caabd86b676712cc06275c2cc0fa 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff00304d",
       "ib_switch_card_pos": "10",
       "interface": "InfiniBand",
-      "ip": "172.16.67.64",
+      "ip": "172.18.65.64",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:13",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
index 6a2a6fca5bf8abb10d659e34602d459d8b3fb13d..76993b3707242720b3ca16e22908a22b53d14279 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff00304d",
       "ib_switch_card_pos": "11",
       "interface": "InfiniBand",
-      "ip": "172.16.67.65",
+      "ip": "172.18.65.65",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:51",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
index c8c67fb34748126e9d93dba746656446a71a51ac..d7e63aa3d65ed02267abb54fb6eaa631aed0f52e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff00304d",
       "ib_switch_card_pos": "12",
       "interface": "InfiniBand",
-      "ip": "172.16.67.66",
+      "ip": "172.18.65.66",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:69",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
index 097642fe175a6070b581409e3657ca98801afd9e..4857682c178639296d4fb780260dbf009ee7953e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003107",
       "ib_switch_card_pos": "1",
       "interface": "InfiniBand",
-      "ip": "172.16.67.67",
+      "ip": "172.18.65.67",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:dd",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
index 1abc5a8ea72477abc7a39017d7c413950a739283..be25d6dbdd5e32e3bb3a0cdf21d7b0dbfc5d4d23 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003107",
       "ib_switch_card_pos": "2",
       "interface": "InfiniBand",
-      "ip": "172.16.67.68",
+      "ip": "172.18.65.68",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:59",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
index 3269397a4e9d99ab51fbdbc731b0b48a1bc33afa..de3b024ccf15e0174fa229e54f7895ccafcdfe77 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003107",
       "ib_switch_card_pos": "3",
       "interface": "InfiniBand",
-      "ip": "172.16.67.69",
+      "ip": "172.18.65.69",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
index 758684d2307bf2d55359fa13c3609d7425c3c4f4..a2bd78a59f69ae3116561d2f37b5a64f4d459ba7 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003106",
       "ib_switch_card_pos": "7",
       "interface": "InfiniBand",
-      "ip": "172.16.67.7",
+      "ip": "172.18.65.7",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:55",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
index 4858f963b020bdfdbb042e8b8cbf0842a4a23b2d..cf7aeb0d2250c288910c9804addfdd4809d38892 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003107",
       "ib_switch_card_pos": "4",
       "interface": "InfiniBand",
-      "ip": "172.16.67.70",
+      "ip": "172.18.65.70",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:11",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
index 729e1194682c204ab4a2067ed090eebbed68ee60..05a84a5fa57c7b3bc62dc5ef23a49c067b77e67f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003107",
       "ib_switch_card_pos": "5",
       "interface": "InfiniBand",
-      "ip": "172.16.67.71",
+      "ip": "172.18.65.71",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:25",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
index 452b1e17ec40e81300a9545f58a5c9232068b003..b35e7e374a8625abd37de3a6bfc1f57328c3b64c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003107",
       "ib_switch_card_pos": "6",
       "interface": "InfiniBand",
-      "ip": "172.16.67.72",
+      "ip": "172.18.65.72",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:cf",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
index 12ba318ab3aa983cdcf2497c9dafc33cad0e78c7..34178919403a55032ee4610437bc272bed3f3d84 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003107",
       "ib_switch_card_pos": "7",
       "interface": "InfiniBand",
-      "ip": "172.16.67.73",
+      "ip": "172.18.65.73",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:fd",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
index cb8f5ef4c6b93d0071fd6b474b72446a72ce614a..9116ebb23a2a574593fa7ed896abf3a0eb90a833 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003107",
       "ib_switch_card_pos": "8",
       "interface": "InfiniBand",
-      "ip": "172.16.67.74",
+      "ip": "172.18.65.74",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:91",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
index ffe6ab4af3b0bc0c6774bd72ad3dfb91322aa6c4..ee8f1a0b5e65b84fbb55fc64ac78482dc049f210 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003107",
       "ib_switch_card_pos": "9",
       "interface": "InfiniBand",
-      "ip": "172.16.67.75",
+      "ip": "172.18.65.75",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:75",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
index b80d0402dac3650bb8ebc06094293a8cf5ccbc84..c0017797da568d695f2e2cce3eb215a4a92c2349 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003107",
       "ib_switch_card_pos": "10",
       "interface": "InfiniBand",
-      "ip": "172.16.67.76",
+      "ip": "172.18.65.76",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:75",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
index a3ee7adf5314c0ec2075d47c409c47a54e7496be..8a8c3c184ab0645e4717d561b96c8d6b18cb442b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003107",
       "ib_switch_card_pos": "11",
       "interface": "InfiniBand",
-      "ip": "172.16.67.77",
+      "ip": "172.18.65.77",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:b9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
index 1f31d7e7d79d442065709efd5246c8401d999cf8..4f1ef641c9e2f630d00ac1ea10bf02c70996e863 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003107",
       "ib_switch_card_pos": "12",
       "interface": "InfiniBand",
-      "ip": "172.16.67.78",
+      "ip": "172.18.65.78",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:ad",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
index 79babb4d6b390f15bf8d5aeb982a3f618993d486..48937915d3c569f90205e08a0c8895030442cbfb 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.79",
+      "ip": "172.18.65.79",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:09",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
index f942f71c16162e7c1c2bb2fb862146f37172b056..c3546bb4cffa1ab010bdf6ccd654a9dde4c01f1c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003106",
       "ib_switch_card_pos": "8",
       "interface": "InfiniBand",
-      "ip": "172.16.67.8",
+      "ip": "172.18.65.8",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
index 9f1ba646fcedc14af4d3f817fc4d23be4a98755c..9169357c74ad96451df8177c7bc00cdc99d6f765 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.80",
+      "ip": "172.18.65.80",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:01",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
index 136f71d1bca451086f5b09fd19503bd73a34e264..84fc7713b01bbf2f2d9d16e0b1b5d68dea76e4b0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.81",
+      "ip": "172.18.65.81",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:61",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
index 8ac9ec2d63151176ad1db596b083930cd52d7143..bbe1f574f4f81cd48f0eb9efa52a1462fa579b0e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.82",
+      "ip": "172.18.65.82",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f9",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
index 6cb88d6726753ce254f2ed3ed789a6dc18391803..c32cbe9d8e9c4994b6a67d5b213b8f366a0b2b20 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003101",
       "ib_switch_card_pos": "12",
       "interface": "InfiniBand",
-      "ip": "172.16.67.83",
+      "ip": "172.18.65.83",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f5",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
index a44558c17dd97f1081f58bc13024aff7d2d0e4cd..995e3f84ceb9018c56da72cc936c31d690d29bdc 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.84",
+      "ip": "172.18.65.84",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:0d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
index 8094f72321a4c40392e8ae90d96f2c41eeff9529..76966877f1c2909cc1d7603c791545816708e8b1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.85",
+      "ip": "172.18.65.85",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f1",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
index b67006e164988bb3fc25841b0e0b7d29a1af6e29..dd618a42874e7544d06e21dbc59a183b1eebf7f1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.86",
+      "ip": "172.18.65.86",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:01",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
index 4385ba7bea17fe360ec574dbdd625c2615282034..4538630b5c1eec8aa7e723457d05ae5ab0ed413b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.87",
+      "ip": "172.18.65.87",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:05",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
index f3ebcf22d29ed3f84ac75e45957727ba11088257..b8d8da87dc78dfba579a9305cf38d02fdec877cc 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.88",
+      "ip": "172.18.65.88",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:19",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
index c01ef354d449eb8c293f8c7a176cd296de5df1d8..ea86972a01d904e810b088e06fe75a4cc8055799 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.89",
+      "ip": "172.18.65.89",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:65",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
index 2db5adf530ced36d71fd8bf31e6e7aa018b55377..e97ff1dd89a27663129cc0b4656aeef5b65366c1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "0x000b8cffff003106",
       "ib_switch_card_pos": "9",
       "interface": "InfiniBand",
-      "ip": "172.16.67.9",
+      "ip": "172.18.65.9",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5d",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
index 00f09ccdb0103314fe58d08818cc61cdc80629c5..25f5b77a352556c4795a0c6a3e8bbc96ebc58904 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.90",
+      "ip": "172.18.65.90",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:21",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
index f02122e3fad9ab492cb2c5a41cf1ea9b7b3764c6..3d9ad3c84b289c8cbb1af9539218497cec7ee2cb 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-91.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.91",
+      "ip": "172.18.65.91",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:00:7b:25",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
index 662741121d354b7e44db19a59dd7af0911c4262c..ebe3a02566e8bbde4b0af5b3231f029391b33f47 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
@@ -46,7 +46,7 @@
       "ib_switch_card": "",
       "ib_switch_card_pos": "",
       "interface": "InfiniBand",
-      "ip": "172.16.67.92",
+      "ip": "172.18.65.92",
       "mac": "20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:09",
       "management": false,
       "mountable": true,
diff --git a/data/grid5000/sites/nancy/environments/sid-x64-base-1.0.json b/data/grid5000/sites/nancy/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f5666889a1c3447952d2ef846d177297..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/sid-x64-base-1.1.json b/data/grid5000/sites/nancy/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f30ebf993ecb9f571209108b7f2465..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/sid-x64-big-1.1.json b/data/grid5000/sites/nancy/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4910f0ce2ee266fa0a3cbc5c8e8026..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/nancy/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb89fe5ad72ec71d71f854a4c794912..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/nancy/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0fd8594a1d48d11529ed5620ecbb420..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/nancy/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/squeeze-x64-base-0.8.json b/data/grid5000/sites/nancy/environments/squeeze-x64-base-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..30b0a480400b40905271d51043768003e62cde82
--- /dev/null
+++ b/data/grid5000/sites/nancy/environments/squeeze-x64-base-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-base-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/squeeze-x64-big-0.8.json b/data/grid5000/sites/nancy/environments/squeeze-x64-big-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..f651be05618dcb7f2b8a6e1a53624a164aef6984
--- /dev/null
+++ b/data/grid5000/sites/nancy/environments/squeeze-x64-big-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-big-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/squeeze-x64-min-0.8.json b/data/grid5000/sites/nancy/environments/squeeze-x64-min-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..9006de5d2a4ceeebc8b7382fe52c6825a260994f
--- /dev/null
+++ b/data/grid5000/sites/nancy/environments/squeeze-x64-min-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-min-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/squeeze-x64-nfs-0.8.json b/data/grid5000/sites/nancy/environments/squeeze-x64-nfs-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..5185a0bb1ddf7c35393027250bf6959b6fd4dee8
--- /dev/null
+++ b/data/grid5000/sites/nancy/environments/squeeze-x64-nfs-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-nfs-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/environments/squeeze-x64-xen-0.8.json b/data/grid5000/sites/nancy/environments/squeeze-x64-xen-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..1812b44b1faddbc83cdeade8c1b7939e9b0918ae
--- /dev/null
+++ b/data/grid5000/sites/nancy/environments/squeeze-x64-xen-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-xen-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/sid-x64-base-1.0.json b/data/grid5000/sites/orsay/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f5666889a1c3447952d2ef846d177297..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/orsay/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/sid-x64-base-1.1.json b/data/grid5000/sites/orsay/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f30ebf993ecb9f571209108b7f2465..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/orsay/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/sid-x64-big-1.1.json b/data/grid5000/sites/orsay/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4910f0ce2ee266fa0a3cbc5c8e8026..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/orsay/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/orsay/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb89fe5ad72ec71d71f854a4c794912..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/orsay/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/orsay/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0fd8594a1d48d11529ed5620ecbb420..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/orsay/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/squeeze-x64-base-0.8.json b/data/grid5000/sites/orsay/environments/squeeze-x64-base-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..30b0a480400b40905271d51043768003e62cde82
--- /dev/null
+++ b/data/grid5000/sites/orsay/environments/squeeze-x64-base-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-base-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/squeeze-x64-big-0.8.json b/data/grid5000/sites/orsay/environments/squeeze-x64-big-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..f651be05618dcb7f2b8a6e1a53624a164aef6984
--- /dev/null
+++ b/data/grid5000/sites/orsay/environments/squeeze-x64-big-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-big-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/squeeze-x64-min-0.8.json b/data/grid5000/sites/orsay/environments/squeeze-x64-min-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..9006de5d2a4ceeebc8b7382fe52c6825a260994f
--- /dev/null
+++ b/data/grid5000/sites/orsay/environments/squeeze-x64-min-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-min-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/squeeze-x64-nfs-0.8.json b/data/grid5000/sites/orsay/environments/squeeze-x64-nfs-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..5185a0bb1ddf7c35393027250bf6959b6fd4dee8
--- /dev/null
+++ b/data/grid5000/sites/orsay/environments/squeeze-x64-nfs-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-nfs-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/orsay/environments/squeeze-x64-xen-0.8.json b/data/grid5000/sites/orsay/environments/squeeze-x64-xen-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..1812b44b1faddbc83cdeade8c1b7939e9b0918ae
--- /dev/null
+++ b/data/grid5000/sites/orsay/environments/squeeze-x64-xen-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-xen-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/sid-x64-base-1.0.json b/data/grid5000/sites/rennes/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f5666889a1c3447952d2ef846d177297..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/sid-x64-base-1.1.json b/data/grid5000/sites/rennes/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f30ebf993ecb9f571209108b7f2465..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/sid-x64-big-1.1.json b/data/grid5000/sites/rennes/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4910f0ce2ee266fa0a3cbc5c8e8026..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/rennes/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb89fe5ad72ec71d71f854a4c794912..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/rennes/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0fd8594a1d48d11529ed5620ecbb420..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/rennes/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/squeeze-x64-base-0.8.json b/data/grid5000/sites/rennes/environments/squeeze-x64-base-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..30b0a480400b40905271d51043768003e62cde82
--- /dev/null
+++ b/data/grid5000/sites/rennes/environments/squeeze-x64-base-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-base-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/squeeze-x64-big-0.8.json b/data/grid5000/sites/rennes/environments/squeeze-x64-big-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..f651be05618dcb7f2b8a6e1a53624a164aef6984
--- /dev/null
+++ b/data/grid5000/sites/rennes/environments/squeeze-x64-big-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-big-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/squeeze-x64-min-0.8.json b/data/grid5000/sites/rennes/environments/squeeze-x64-min-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..9006de5d2a4ceeebc8b7382fe52c6825a260994f
--- /dev/null
+++ b/data/grid5000/sites/rennes/environments/squeeze-x64-min-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-min-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/squeeze-x64-nfs-0.8.json b/data/grid5000/sites/rennes/environments/squeeze-x64-nfs-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..5185a0bb1ddf7c35393027250bf6959b6fd4dee8
--- /dev/null
+++ b/data/grid5000/sites/rennes/environments/squeeze-x64-nfs-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-nfs-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/environments/squeeze-x64-xen-0.8.json b/data/grid5000/sites/rennes/environments/squeeze-x64-xen-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..1812b44b1faddbc83cdeade8c1b7939e9b0918ae
--- /dev/null
+++ b/data/grid5000/sites/rennes/environments/squeeze-x64-xen-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-xen-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
index c355dd8770f457fb37778b7b835e698e20cfda55..e7cd7781af143bec1bc60d60799d957d711ef0b3 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-1.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.1",
-      "mac": null,
+      "mac": "00:14:4f:20:90:18",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:90:19",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:90:1a",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:90:1b",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
index c031f705443b6a675551b3449130cadb16c993d0..5ae20dc3ad9eada59791e69b8cc7c2db95e3ede9 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-10.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.10",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:ac",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:ad",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:b2",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:b3",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
index fbd98cc2ef2758032ec5d43e6478e81767c0b8a5..5d9dc77252a6607b160468b98b857962d6ce602a 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-11.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.11",
-      "mac": null,
+      "mac": "00:14:4f:8d:13:98",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:8d:13:99",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:8d:13:9a",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:8d:13:9b",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
index 86ad83c27e79c87662a14b25e3c194320bacbfd7..30e6a2b1db978a3ba867dae66f3a5bb9759dbd64 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-12.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.12",
-      "mac": null,
+      "mac": "00:14:4f:1f:cc:00",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:cc:01",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:cc:06",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:cc:07",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
index 274b527ea3010689b63fac1e5ac9f20b4ec2837e..91faa3c2cb21265d702bb0e964fc30ae92e30a0c 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-13.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.13",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:68",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:69",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:6a",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:6b",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
index 853da05135ee91039918e24cbd59433d78ee28b0..6df63117d638470dad3f835744c28db205196d5e 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-14.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.14",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:1c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:1d",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:1e",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c9:1f",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
index f42cfc03ce09f92389668517483a45a7325b1897..2e1ef3b0b56aa783d5b3001cff27ed4a7e23cb99 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-15.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.15",
-      "mac": null,
+      "mac": "00:14:4f:20:8b:26",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8b:27",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8b:2c",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8b:2d",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
index 32f085e350869509607bea4a00f6d42c1f2361f8..118b807a71919fa4ea34737b138762096f760732 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-16.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.16",
-      "mac": null,
+      "mac": "00:14:4f:20:a8:ea",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:a8:eb",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:a8:f0",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:a8:f1",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
index 036afac23b0d8e0600a8cc440af933cab7c631ab..1c2c5059cbf9b865a3cd4fa3405eff309af4681b 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-17.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.17",
-      "mac": null,
+      "mac": "00:14:4f:1f:fc:24",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:fc:25",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:fc:2a",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:fc:2b",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
index 32ae7dcd601c57735ac0339438ef0605ce18e06c..f3b78c00152d522dc6ae27d8e49c5114ff11bc39 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-18.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.18",
-      "mac": null,
+      "mac": "00:14:4f:20:ca:78",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ca:79",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ca:7e",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ca:7f",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
index 1ba0028dd3d6111a7b360cca6ea1c199a005b75c..78ec6fd113f788a537d13f130f443a375bb15901 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-19.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.19",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:5c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:5d",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:5e",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:5f",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
index 43318f025ee61ef50f637442574b6c29c1b9425d..444373b913cbf1be32426ca6afc45f397d52e0b3 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-2.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.2",
-      "mac": null,
+      "mac": "00:14:4f:20:89:60",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:61",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:66",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:67",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
index 53f49c84bd64737c2e4df21a2621880a904ea45a..8b4db1e8632d0230ebc5de120294a6ca0c09c8f9 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-20.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.20",
-      "mac": null,
+      "mac": "00:14:4f:20:8a:98",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8a:99",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8a:9e",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8a:9f",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
index 24bdfa7e385f02da4ce05e3966bd0c2f130f4b2f..015525b5bbc24993873fec609121e73c8369b17b 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-21.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.21",
-      "mac": null,
+      "mac": "00:14:4f:20:8c:00",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8c:01",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8c:06",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8c:07",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
index e882616d665de860f89bead3cbda6854a0af0703..d48e3621096a384a9582d0c9f1d5a8550c51197d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-22.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.22",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:28",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:29",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:2a",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b7:2b",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
index 568d154cccea074bfd8a0bbbd1b2caa8ebbb3e0f..3698732817f26cc264bfe95c750d03307d64564e 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-23.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.23",
-      "mac": null,
+      "mac": "00:14:4f:20:ac:ac",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ac:ad",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ac:b2",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ac:b3",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
index 823be14b6f6c617225f41ceb00660bd2ab3beb69..db85060fe9adee639afb066392bdfdf7b0df7493 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-24.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.24",
-      "mac": null,
+      "mac": "00:14:4f:1f:fc:ec",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:fc:ed",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:fc:f2",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:fc:f3",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
index 85a504431f514fbcde7c2fac0223fdbc73560c87..28b0014c6fb99761d4aa0786b3aa954be85d2cc8 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-25.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.25",
-      "mac": null,
+      "mac": "00:14:4f:20:89:e4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:e5",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:e6",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:e7",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
index 38d8d0e9f646cc46e166b21bb5b9c4cb9b46f680..edbd7cd6e4603dfca8688524a7edef10d43d0340 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-26.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.26",
-      "mac": null,
+      "mac": "00:14:4f:20:ad:f8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ad:f9",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ad:fe",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ad:ff",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
index de680cb8b12e6b6e30b2b0430d8557792150925c..52737ae2c773825cdaec1334d48a3ab52fd8c99f 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-27.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.27",
-      "mac": null,
+      "mac": "00:14:4f:20:c0:88",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c0:89",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c0:8e",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c0:8f",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
index 6fb5d108f62d272a1c398856b6313b3447ed9d33..45b507c768572d4c1613e189c120852f652292a9 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-28.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.28",
-      "mac": null,
+      "mac": "00:14:4f:20:c6:f4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c6:f5",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c6:fa",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c6:fb",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
index e31af02a6bc874e1b2f82bc024bfae04605ebd5f..cf2a10cf25e39f99795412ffda338a7c51175a52 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-29.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.29",
-      "mac": null,
+      "mac": "00:14:4f:20:ca:44",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ca:45",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ca:46",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ca:47",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
index 0591b1259b1f1b714d330dca6dc16e9c7370bdcf..601cb2f6aa107aab8bb7114128f748204fb0bce1 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-3.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.3",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:4c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:4d",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:52",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:53",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
index 2f9c73a6d4b03705b7958063221e6efc452c46ab..786dd07b76b39eae96e101cb6caa93a729c569f2 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-30.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.30",
-      "mac": null,
+      "mac": "00:14:4f:1f:c3:b8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:c3:b9",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:c3:ba",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:c3:bb",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
index b29fe022552ce3a9c27588b559141f8556053d70..d304273e16cbff1cc06fac33f1c01fc82b4e9464 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-31.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.31",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:12",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:13",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:18",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8d:19",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
index d3aac50403358b6499b5a4450fd0cf11ef09e005..3dbe37308d73fd648b24bf1be28c17c3cce10dc6 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-32.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.32",
-      "mac": null,
+      "mac": "00:14:4f:20:05:3c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:05:3d",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:05:3e",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:05:3f",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
index 956b49c7a6d85c2299de753e07e970e3fc0e407c..a2c8482cc456a25f0dcb3d09c0699b3de8c23839 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-33.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.33",
-      "mac": null,
+      "mac": "00:14:4f:20:ad:e0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ad:e1",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ad:e6",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:ad:e7",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
index 4b56ce695e01e9f5e0356413c56de7c3301ca69c..6852091f31b9d3f96f83e66508a72792b01738da 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-34.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.34",
-      "mac": null,
+      "mac": "00:14:4f:20:af:1c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:af:1d",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:af:22",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:af:23",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
index f87e49976136a8518687bca969ebfab478cbf0ef..f9d59a322a2d5405b979cd2a0af4e4456281f770 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-35.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.35",
-      "mac": null,
+      "mac": "00:14:4f:20:8a:8a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8a:8b",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8a:90",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8a:91",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
index 0852432a552808f1fc42cd8e4e6d5c433786d777..a455b17778c2d8a993ce741789746aef07e6a571 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-36.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.36",
-      "mac": null,
+      "mac": "00:14:4f:1f:ff:54",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:ff:55",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:ff:5a",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:ff:5b",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
index 9734c73dd2748a7ee2e73423fe6d18f5a4e9c587..7b79ea84452b099f8a5f20479bfde685a8389295 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-37.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.37",
-      "mac": null,
+      "mac": "00:14:4f:20:b0:5c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b0:5d",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b0:5e",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b0:5f",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
index 01dde4db110509bd3cd666e95bc13bd8b1345880..8bb1a516062c78f879bf316197ad3912dad53f2b 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-38.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.38",
-      "mac": null,
+      "mac": "00:14:4f:20:a9:74",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:a9:75",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:a9:76",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:a9:77",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
index 8cd8459a22dfc9ab57114d9f7278c1d5dd785fe3..963047fed9bda4c80e5bbc27d7ba74e1c22f915c 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-39.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.39",
-      "mac": null,
+      "mac": "00:14:4f:20:af:ac",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:af:ad",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:af:ae",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:af:af",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
index a71a79bb38f037ac1be57d83e4121825abca082c..79bdaf4952eb26d09c249e7b37c0867c38376376 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-4.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.4",
-      "mac": null,
+      "mac": "00:14:4f:20:c5:ca",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c5:cb",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c5:d0",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:c5:d1",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
index 28d931fb04bd418b590f8ffe9e7a976d8ba69a6d..cc3f56b9e57c90481ee81c749f395191e528ce34 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-40.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.40",
-      "mac": null,
+      "mac": "00:14:4f:20:bc:22",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:bc:23",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:bc:28",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:bc:29",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
index 626073635e8fe11f9c46265eb39c1b828e5106f7..bb95e32b7ab13ce996659d97ba92c7c80d00eca7 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-41.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.41",
-      "mac": null,
+      "mac": "00:14:4f:1f:e7:e4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:e7:e5",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:e7:e6",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:e7:e7",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
index 18fef186069b4353098fa9dce4db79830b6bd107..e42617b13dd8ae457674c4748eb5323dca850ec1 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-42.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.42",
-      "mac": null,
+      "mac": "00:14:4f:20:03:88",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:03:89",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:03:8a",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:03:8b",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
index 2545796af5cd041a286cdf6628ae9a34769d7f3f..df7ea79eda18ed29b562ee7f8902cdfc1b87df80 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-43.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.43",
-      "mac": null,
+      "mac": "00:14:4f:1f:ca:ba",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:ca:bb",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:ca:c0",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:ca:c1",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
index 227bb3deced3a967d96f46e88479feb13cab9aab..d2f7a17b0501ff63725d87fbd323e60a6a18957d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-44.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.44",
-      "mac": null,
+      "mac": "00:14:4f:20:bf:4c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:bf:4d",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:bf:4e",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:bf:4f",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
index 3872f6065b7a544885f04b1bbcda78721968e7c0..001586d7b61bb5d9df5760eace08dd6b02ab1f8d 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-45.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.45",
-      "mac": null,
+      "mac": "00:14:4f:20:05:80",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:05:81",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:05:86",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:05:87",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
index 4458abf87d8412d09e0dd65d4ef8611eeded960d..06f0a842571231c6a3cfc621a3d3ff7237bc35df 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-46.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.46",
-      "mac": null,
+      "mac": "00:14:4f:20:8b:f4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8b:f5",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8b:fa",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:8b:fb",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
index 618af4f3e90bf996cb399ffa6d16ca49b269e319..60671ebaa256053913350210a2f6b8d30bdd3543 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-47.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.47",
-      "mac": null,
+      "mac": "00:14:4f:20:bf:c8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:bf:c9",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:bf:ce",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:bf:cf",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
index 948baff93cc3de7681bff7e653e6dac2cc6f5599..db1f49877bedc649dd385f43f599ee3b5e106039 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-48.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.48",
-      "mac": null,
+      "mac": "00:14:4f:20:89:5e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:5f",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:64",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:65",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
index 86efe651d9a312d69fa918103d9dd46553d95c06..e341bbf661815d9f18b1e2ef8abfcd6bb8570d60 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-49.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.49",
-      "mac": null,
+      "mac": "00:14:4f:20:b5:04",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b5:05",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b5:0a",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:b5:0b",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
index d3037d856326df078d924ae7defec64d645dc9d4..36f23d4d6e95d0df6425c496bdd3eaa42ee8f011 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-5.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.5",
-      "mac": null,
+      "mac": "00:14:4f:45:a6:9a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:45:a6:9b",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:45:a6:9c",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:45:a6:9d",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
index 158dafeea92f5f9486b6ea5db4d132567087bbf6..63f8d11895e5174899adb85ceba461d4335b0f66 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-50.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.50",
-      "mac": null,
+      "mac": "00:14:4f:20:88:fe",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:88:ff",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:04",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:05",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
index 6c09e8a4c00e02835782bb3f1501c0d1bccaa3ef..813e748b5c1da0e2bcfde0af2537601a62a755a1 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-51.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.51",
-      "mac": null,
+      "mac": "00:14:4f:20:5f:e4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:5f:e5",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:5f:ea",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:5f:eb",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
index c82e73b62a8122765d464f61c8989e20a83a5783..b203e283760fa79bf81d8613a116eab47defb652 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-52.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.52",
-      "mac": null,
+      "mac": "00:14:4f:20:64:fe",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:64:ff",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:65:04",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:65:05",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
index b15f4eb888df5b291efbe430f26677cf977c58c6..cf645d2ba1f1cd372fff651c6f9d56cada0dd64f 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-53.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.53",
-      "mac": null,
+      "mac": "00:14:4f:1f:c8:48",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:c8:49",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:c8:66",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:c8:67",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
index 258a6035064988dccd75a92efad6c0cb846020ba..f1d9c77142d083607c809fb5b73c3e164fc12a73 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-54.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.54",
-      "mac": null,
+      "mac": "00:14:4f:20:5f:78",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:5f:79",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:5f:7e",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:5f:7f",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
index eebb2ad648e6c5ed8bcfa1dd4cc53a5ea1d4537c..a7f3b2b8fd7c6ce8de2edf1121684af95568c2fd 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-55.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.55",
-      "mac": null,
+      "mac": "00:14:4f:1f:c4:a4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:c4:a5",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:c4:a6",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:c4:a7",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
index 1dee162b2f5b5fc280620cdd015438aaecb3baef..9c1e643b30156d4d9ca97c69bb0db742631298f7 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-56.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.56",
-      "mac": null,
+      "mac": "00:14:4f:20:89:2c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:2d",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:32",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:33",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
index 0dec999be13d3bd78efd86d7fc0e84cf938190ac..f8d312ccf9e1966244a614d8ab6b59a154514271 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-6.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.6",
-      "mac": null,
+      "mac": "00:14:4f:1f:bd:24",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:bd:25",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:bd:26",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:bd:27",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
index fba770f99bfafcf970ae5d7128e044b4e559e6a8..22bd778fa0a0186219cc333e11799856803b25e5 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-7.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.7",
-      "mac": null,
+      "mac": "00:14:4f:20:89:74",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:75",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:76",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:89:77",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
index b04513f92a6190c6c2793b86fc767eae11e4914e..654e6c42956967c342816158c8e62da992179027 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-8.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.8",
-      "mac": null,
+      "mac": "00:14:4f:20:a8:b0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:a8:b1",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:a8:b6",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:20:a8:b7",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
index 88a8ee99a5f22a18ca089ff5ef1010f11bdb6029..2cfd2bad1ccb95043838c0e3a3c20461d2f2672a 100755
--- a/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
+++ b/data/grid5000/sites/sophia/clusters/helios/nodes/helios-9.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.9",
-      "mac": null,
+      "mac": "00:14:4f:1f:e8:80",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -29,7 +29,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:e8:81",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -39,7 +39,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:e8:82",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
@@ -49,7 +49,7 @@
       "driver": "e1000",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:14:4f:1f:e8:83",
       "rate": 1000000000,
       "vendor": "Intel Corporation",
       "version": "82546EB"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
index f3e8e2e2b34061bb08bc1f6c3f442a96fd7380ed..37498fd03abe053d579d24bb25c9534111f4f4b6 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-1.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.1",
-      "mac": null,
+      "mac": "00:16:36:91:e7:d0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e7:d1",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
index 21441eb18b72b202bad2ae716fdc4167b441eb47..1374679594de4509541cf673a4c1fe9f61e9d846 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-10.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.10",
-      "mac": null,
+      "mac": "00:16:36:91:eb:d0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:eb:d1",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
index 4bd530b52d9ed7016dcecadd92326fbc5eec8c28..cd351685b24b050eb416d1771496cee2a6ec769f 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-11.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.11",
-      "mac": null,
+      "mac": "00:16:36:91:e9:dc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e9:dd",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
index 61ffdacefc9cee3588f27e694a287a982c11b7a4..bf12fd59c0a0afb769f7afeed2570c7d31e99a42 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-12.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.12",
-      "mac": null,
+      "mac": "00:16:36:91:eb:60",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:eb:61",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
index d946fc782cdf59570a7933fbf567606dcd5c2007..bb56d10d294e3a66c74333d93454bb270928a006 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-13.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.13",
-      "mac": null,
+      "mac": "00:16:36:91:e8:5c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e8:5d",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
index b0716e0f43161f401aa3be5217cfd0104d9abac9..74b7e5c262a6e41838999b618721a2ee7928ca4d 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-14.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.14",
-      "mac": null,
+      "mac": "00:16:36:c9:fb:e4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:c9:fb:e5",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
index 0b6ee4cf24fa637e2b87388295a38fe0d711ec0f..5b1a9b63783d4e2c2b9c37ea10a90ca7d551ba87 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-15.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.15",
-      "mac": null,
+      "mac": "00:16:36:c9:fb:34",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:c9:fb:35",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
index 5904ec77e8e1458757a06e9472e7f96ac663d922..a8079b5821ad878f3ec9dbc159ab5f1fdd4d6045 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-16.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.16",
-      "mac": null,
+      "mac": "00:16:36:c9:fb:94",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:c9:fb:95",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
index 52fdcb03e5cad0d19d04cb46d0d9d526d8f1d1b1..4182ee9d97975de7e4f4a78a3dcd7aeab8e18c1e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-17.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.17",
-      "mac": null,
+      "mac": "00:16:36:c5:8a:83",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:c5:8a:84",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
index 227ad4a4f4ced45f08ff1f0e80a35aee345b191f..16adf55f92ca91d0df07d93f2f9ef0cf2475dd2a 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-18.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.18",
-      "mac": null,
+      "mac": "00:16:36:91:ec:14",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:ec:15",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
index 873533eca511043f5f69b1bfea0a39d54582bb81..b86e513526e0e15284f262a07733367ac441b9cf 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-19.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.19",
-      "mac": null,
+      "mac": "00:16:36:91:ea:c0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:ea:c1",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
index fcf22b302754bcacf4293f27565f6e63c1ccb6b6..0369696607bf8fc19cdd79e34b2859daf80f5675 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-2.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.2",
-      "mac": null,
+      "mac": "00:16:36:91:eb:84",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:eb:85",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
index 115db114c12e5804f2583cda80694c37f6ac6576..033520d4cd8975d972133f3e993028140d0cdefd 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-20.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.20",
-      "mac": null,
+      "mac": "00:16:36:91:e9:74",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e9:75",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
index 69abb209ed0a65af3d90982d151aee556432a263..9a1f87c048cd48eac946f7f46a5d157289924095 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-21.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.21",
-      "mac": null,
+      "mac": "00:16:36:91:ec:24",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:ec:25",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
index 5d65de3eee76fbb162a7d749f0556e1b479ce979..5729251242cc888a17779fb87b77e0f4f4b102c6 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-22.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.22",
-      "mac": null,
+      "mac": "00:16:36:91:e9:d8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e9:d9",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
index b4103910f16bc800313103977f698b2b723a53ce..88f5565efae6b7bb9525f7c7589fa9ba65aa5f2f 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-23.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.23",
-      "mac": null,
+      "mac": "00:16:36:91:eb:1c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:eb:1d",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
index d43a5bc46db50bfe76d1e4677b7545f27237d162..388e20219d7c36c3306901d2149737f780ec28a4 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-24.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.24",
-      "mac": null,
+      "mac": "00:16:36:91:e9:ec",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e9:ed",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
index 8454235967c0c3e5d597c06230501e4aed2055f8..1c59ded635790193b077ed5669b9ff8a7d9f453d 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-25.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.25",
-      "mac": null,
+      "mac": "00:16:36:91:eb:2c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:eb:2d",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
index bd77e136b13e6df71a37934c481717e3e9964f61..f8a8c6e156923d65615643965d691fe3652bf3d9 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-26.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.26",
-      "mac": null,
+      "mac": "00:16:36:91:eb:d4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:eb:d5",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
index 1650770c26273ce38259a55835e5cb5cde8f1da5..3604b6cfe29609d36acd1336c5d2f8179f9cf167 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-27.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.27",
-      "mac": null,
+      "mac": "00:16:36:91:e9:f0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e9:f1",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
index 8ea322309e6bbf628ae27ecee32c77ea2d2e47da..2cbd828b34acd1750e170d95247bd3cfe8528719 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-28.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.28",
-      "mac": null,
+      "mac": "00:16:36:91:e8:2c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e8:2d",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
index 3bbdec755b8b6c232b0c71f7397fcdd3c8b8cea4..4e351cc057e54f9ce161c9c2b54add26da4fe29d 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-29.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.29",
-      "mac": null,
+      "mac": "00:16:36:91:e8:dc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e8:dd",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
index a961602974a74d2d84786cf9508e376ca5876e70..23f21701203856136c3514c3c19b8175b2f43b0c 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-3.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.3",
-      "mac": null,
+      "mac": "00:16:36:91:eb:24",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:eb:25",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
index 0e502a02e5e695ff2135fae73bc193bdc9613dcc..26e9555439c0ed460df464cc17956de45d5fe5a0 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-30.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.30",
-      "mac": null,
+      "mac": "00:16:36:91:ea:94",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:ea:95",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
index e5b65a99dd554fb87288440c49de26175eb47b42..5bb5da52eda9773b0f24593d2bdb5beb43494c1a 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-31.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.31",
-      "mac": null,
+      "mac": "00:16:36:c9:f9:80",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:c9:f9:81",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
index 1ed03a80cdd7b129997c03bfea40827631b8b9fa..36fe02c9b65f8dadc088fbe82b596404550932a0 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-32.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.32",
-      "mac": null,
+      "mac": "00:16:36:91:e9:94",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e9:95",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
index 752562001d69f6b2cb22da28f112a3755c97e877..b223a6e5db286f9b6de198207e823057332a6f40 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-33.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.33",
-      "mac": null,
+      "mac": "00:16:36:91:ea:84",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:ea:85",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
index 1f2a3e6de639119244e64d1711d633c1fee79dc9..d619e256d3246fbeb93dfd5c17295e9395c380bd 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-34.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.34",
-      "mac": null,
+      "mac": "00:16:36:91:eb:dc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:eb:dd",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
index d5903091cea4b9da0191872c68493c33ded7ef72..4e0587977fbfc46930f495f03e76fced1a1076e4 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-35.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.35",
-      "mac": null,
+      "mac": "00:16:36:91:ea:08",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:ea:09",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
index b8ab7a9a9cbc4ae356631668520ad8f93d19236e..39420986a7dcaca2f8dadc032416f92e317c8901 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-36.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.36",
-      "mac": null,
+      "mac": "00:16:36:91:ea:08",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:ea:09",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
index 432113c1f18848ae5a03e963afa347c688113578..00c783cf65ca426058bb0742d92b318fb4ef9aee 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-37.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.37",
-      "mac": null,
+      "mac": "00:16:36:91:e9:a4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e9:a5",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
index f2288f3c29bc551b9193d413979705e5c47f18e7..c5a8be754e25f7a8575d53c87f973b56b5bb94f8 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-38.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.38",
-      "mac": null,
+      "mac": "00:16:36:91:e8:6c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e8:6d",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
index 6d45bc147edd675f982cb9babf3a5ae28ed554a9..bb6dfc67e30e177c2843a775704d25af3258438a 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-39.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.39",
-      "mac": null,
+      "mac": "00:16:36:91:ec:20",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:ec:21",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
index 463901af293aa31cb7f946e2b39d5a9d615333bb..7d8f18c9ecc27f678abd9414bbf50850713aca5b 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-4.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.4",
-      "mac": null,
+      "mac": "00:16:36:91:e9:d4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e9:d5",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
index 66a4a9ad047d67de5a76a80f1f26542707bbe9e4..9da71df7d2bd1a5be04d6ce41a62c39079eb796e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-40.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.40",
-      "mac": null,
+      "mac": "00:16:36:91:eb:08",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:eb:09",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
index 3e06c26cd4406cdc530bb048e5a1ef81a77c6da7..d60d251ca06535f37ea0ed1837fff38f41ebfe42 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-41.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.41",
-      "mac": null,
+      "mac": "00:16:36:91:ea:f8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:ea:f9",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
index a4695978cedbef7dda45364453fb7bc06bd3dd8b..fb7e325a13dd1f7b99a1352c30ef6261ea3797b2 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-42.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.42",
-      "mac": null,
+      "mac": "00:16:36:91:ea:90",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:ea:91",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
index 2653a95a56dbb56aff02b4116ef4ea5590e23257..56abf46046aaa830de12f60051a291046302f75f 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-43.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.43",
-      "mac": null,
+      "mac": "00:16:36:91:ea:fc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:ea:fd",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
index d301f8682f7c882d6541f0a153c7dd73251d1e16..2cbf19c5b8d7b39eaffdd433761cff3c7c6711fe 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-44.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.44",
-      "mac": null,
+      "mac": "00:16:36:91:e9:18",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e9:19",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
index 235da71a642d85f3f260bb7869c07012c8e34d46..04536cae16b30164e80f269faeab24fee2e75f68 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-45.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.45",
-      "mac": null,
+      "mac": "00:16:36:91:e9:58",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e9:59",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
index b10e1e81df0d1b6570cddf493464616b9238d1b5..bbd874fbcf7da61115f57c18c039a2bfec41bb0e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-46.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.46",
-      "mac": null,
+      "mac": "00:16:36:91:eb:80",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:eb:81",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
index 41b05b43481fc33ee3fd29c607d8754a27c938be..51e07818e1fb8dbf8bf2be03767e75f63af8e0b4 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-47.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.47",
-      "mac": null,
+      "mac": "00:16:36:e9:26:c6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:e9:26:c7",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
index 622a475791fb5a631ab38e0d3781c62d95c9d3ed..c887e2908fb079cc760ce8cf40e553ce6c554318 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-48.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.48",
-      "mac": null,
+      "mac": "00:16:36:91:eb:28",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:eb:29",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
index 9af56e12969c9fe4cfb825aa36b03c0356820fd5..3e812dbc00c9911e71090e0d2f1f288b86a86968 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-49.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.49",
-      "mac": null,
+      "mac": "00:16:36:c5:89:17",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:c5:89:18",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
index 199c08c3a734ff2bde3922e35495c50f16b29856..7cc8ebcbcc02c7177ad5bc2351a17e409234c741 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-5.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.5",
-      "mac": null,
+      "mac": "00:16:36:91:e8:e8",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e8:e9",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
index 1fc58640c3bed9c92afde86ba2687e330b5f9025..001e4b9e5588dbeed398a72ac7d5e7296612b74d 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-50.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.50",
-      "mac": null,
+      "mac": "00:16:36:91:e9:e0",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e9:e1",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
index fbd942fbe78fd4d428e48bc8ed525853ad8c69cb..2c2308cbce1dbfb171aee7d3f0017b165b301d86 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-6.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.6",
-      "mac": null,
+      "mac": "00:16:36:91:e8:70",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e8:71",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
index eb59864502b6c8751bc419cf54c2b1302ece3f38..e27b604cd5bee20e2fb2a9ed463fbca8186c1262 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-7.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.7",
-      "mac": null,
+      "mac": "00:16:36:91:ea:d4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:ea:d5",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
index 8902d2d1c317b8e313b5d922b7c72f0b87ad9f65..d45a67ee2ebee9bf89177e9c23ba27144b2e687e 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-8.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.8",
-      "mac": null,
+      "mac": "00:16:36:c5:8a:87",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:c5:8a:88",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
index 62b3c040c79c9f01be05f45fb5248d056d3234bc..f435669cb3d933076bc9a3c7f8c98f64025952c2 100755
--- a/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
+++ b/data/grid5000/sites/sophia/clusters/sol/nodes/sol-9.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.22.9",
-      "mac": null,
+      "mac": "00:16:36:91:e9:90",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "forcedeth",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:16:36:91:e9:91",
       "rate": 1000000000,
       "vendor": "nVidia",
       "version": "MCP55 Pro"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
index 03928a20865199bbc5724cef6e86b2a958cf05dc..31a67851f6f15251afb04e74b47e8e87eb5fcd40 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-1.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.101",
-      "mac": null,
+      "mac": "00:26:b9:58:e6:82",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:58:e6:82",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
index dd83aa1927492f3676877431b08ae66b147a82d3..4ab826078dcfadc87f768271ca42af42d5a9a01d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-10.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.110",
-      "mac": null,
+      "mac": "00:26:b9:3f:49:65",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:49:65",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
index 65c47dbe6cb99860af7d7cfcfcc57bd83a2ac3bc..602256215a0f7ba03fa048dbef4a4f239783d377 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-11.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.111",
-      "mac": null,
+      "mac": "00:26:b9:3f:47:0c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:47:0c",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
index 2dfab89ef45a4bce36c9ed518591c69334d2de21..c58628671760c10bb92cbb5ab87f4849c84397b3 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-12.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.112",
-      "mac": null,
+      "mac": "00:26:b9:3f:49:5c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:49:5c",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
index c2152a408a52e14d62c5c465b9a69dd88040ffe2..e80af800734fad60bc04b29814e77e3e8749d23f 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-13.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.113",
-      "mac": null,
+      "mac": "00:26:b9:3f:4c:78",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:4c:78",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
index 48b6ed4bd5eb8c30ee1a983c26e15fa8c1acf8fa..c1325e64dc501710887b7dadaaff8bb4de64f781 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-14.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.114",
-      "mac": null,
+      "mac": "00:26:b9:3f:4a:61",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:4a:61",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
index 2daf0b37d837c89dd55bee6e92d1261cde3d47d2..5c70fa4bd7910a5578db2f252d997c3833d353c9 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-15.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.115",
-      "mac": null,
+      "mac": "00:26:b9:3f:44:89",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:44:89",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
index 181850ef5ddc70ce5e7d30eb1da0aeeb89b83ffe..d4d20c7acf81771aaa63ed800fe7b0c88d0fdb43 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-16.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.116",
-      "mac": null,
+      "mac": "00:26:b9:3f:41:0c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:41:0c",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
index e6edfa463cf2b8d211a4115317320d72fa750061..15e3360cfcee700ff027434afa939d55c7a7178d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-17.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.117",
-      "mac": null,
+      "mac": "00:26:b9:3f:47:db",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:47:db",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
index 8733fa36203dbf84e5e8f1e0f81b75e196a2990e..c063821fc3dc55e8dd2e7536f09f9f3d5f95decb 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-18.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.118",
-      "mac": null,
+      "mac": "00:26:b9:35:c4:83",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:35:c4:83",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
index 0a8846f1992287a9fef3e281259b3b0c56fe4ffa..ff37cd47b7a86ab7c6fa1bc3548f319e308ace30 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-19.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.119",
-      "mac": null,
+      "mac": "00:26:b9:3f:40:67",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:40:67",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
index f9ee756aa11bd4864d4d6a41a811d7663bba1f5f..27e879d2592cd1b3f1811290cc852afb10af6e04 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-2.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.102",
-      "mac": null,
+      "mac": "00:26:b9:3f:49:38",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:49:38",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
index 3465183a0949d225493c6c62894378d86bf96d8c..16561887412d3e4ae53d35dfe5ee9060f8177d61 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-20.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.120",
-      "mac": null,
+      "mac": "00:26:b9:3f:46:12",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:46:12",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
index af617cda08a0522ee705b77db10b5933a78bd88d..a97333761f4a301423778b4a898b15a4fb05dc78 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-21.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.121",
-      "mac": null,
+      "mac": "00:26:b9:3f:3f:fb",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:3f:fb",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
index 3d6de7da81ddb998417812e1155c2ce27ab27acb..8370e31e53b9576155210d43daa4f1689b7681fb 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-22.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.122",
-      "mac": null,
+      "mac": "00:26:b9:3f:47:66",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:47:66",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
index cf3d1b5b024bdfa6002e4d241ce514534f70c509..bb274f68954205b17a75295c7d07f7f02f96fb0d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-23.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.123",
-      "mac": null,
+      "mac": "00:26:b9:3f:4a:dc",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:4a:dc",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
index 80937631b8238dc0d5dd46afa658cb7a0336a566..cd98d80400c855b18d079466f5a65900f00fbca9 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-24.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.124",
-      "mac": null,
+      "mac": "00:26:b9:3f:47:b4",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:47:b4",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
index 7cbfa8cb54bd4ff2a1b2832c106e451a92891700..ac6941b322a2f2d255dc179fbde8c881f1f50ad2 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-25.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.125",
-      "mac": null,
+      "mac": "00:26:b9:3f:47:a2",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:47:a2",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
index eb03153c3df7c6d2e55041333e24d08d1ed50c5e..f29c23e2685b02b39e825224a01ff5c7e5055b51 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-26.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.126",
-      "mac": null,
+      "mac": "00:26:b9:3f:4b:4d",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:4b:4d",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
index 57dea573a809340f708c01ed0a69ded53e540259..b03ef8f2b2749f7d2cb6a4abb4f4c7340d9aac1c 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-27.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.127",
-      "mac": null,
+      "mac": "00:26:b9:3f:4b:62",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:4b:62",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
index 185ec58dd7305fdbf8e138238edb378a0090e558..c179e36558c1daceb8b6e39cec406efcb8857deb 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-28.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.128",
-      "mac": null,
+      "mac": "00:26:b9:3f:49:56",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:49:56",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
index 4cf6ca94eece6d35f3d8d6d1046947c64a1ff22e..f5f189fbd626a05c1f4a8b9835857b245c221393 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-29.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.129",
-      "mac": null,
+      "mac": "00:26:b9:3f:47:ba",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:47:ba",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
index 4bf111279b56358179c23c03fbd28702aad233ed..c37c8f431d05b989c7fca73c72e1a2e28be30af1 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-3.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.103",
-      "mac": null,
+      "mac": "00:26:b9:3f:4a:5e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:4a:5e",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
index b29c6032c2fb4be1a907b211822b3272ae695380..1ef9acce1522caf1f76338cfe7b84d52583f0c27 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-30.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.130",
-      "mac": null,
+      "mac": "00:26:b9:3f:41:30",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:41:30",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
index 8ab3524068e932a272caf172ffe793e39c2d1d4b..1fa2b889d97f90c6a8efc4826e3fe3ba80f2fc61 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-31.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.131",
-      "mac": null,
+      "mac": "00:26:b9:3f:4b:56",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:4b:56",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
index 06797a9bb097ec7ea9e5c0aab922f6a7fa8b81a3..8fe6fc58d363191fec236b6c0e1669fb1a2b0b57 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-32.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.132",
-      "mac": null,
+      "mac": "00:26:b9:3f:44:68",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:44:68",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
index 8a19d2b801e72bdc2ae74750c72ab957a89e3f81..5735abfb11548b801fba66eb90c3565428549289 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-33.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.133",
-      "mac": null,
+      "mac": "00:26:b9:3f:3f:67",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:3f:67",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
index f03a0179a99b9fcd020a9ed0bdbd71ddcb203b15..67530e01b5e3ee62fa936bdde023ff8da99f6b03 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-34.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.134",
-      "mac": null,
+      "mac": "00:26:b9:3f:49:5f",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:49:5f",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
index 135b97b7f4a39e90fb8029581655d16e55023b88..e5089fe6fa93f667856d952f6c44f8f4a324003c 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-35.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.135",
-      "mac": null,
+      "mac": "00:26:b9:3f:3f:1c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:3f:1c",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
index 0fac1435c0c71b86343ce00010882e0b2d9b7906..f65cc97cb83988e79540bc1b04f72f7f76bda2c6 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-36.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.136",
-      "mac": null,
+      "mac": "00:26:b9:3f:4a:94",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:4a:94",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
index d3fe6169bbd1184429937660385b1eba2b5c2706..13d8b5e049b17ec608c72bdcfd9472c763b98d96 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-37.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.137",
-      "mac": null,
+      "mac": "00:26:b9:3f:4b:2c",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:4b:2c",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
index a6217efc1096304caeed2469aacd07227948d2b9..f97d1f2cb7ad2dc912db221aece0b925c15be3bc 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-38.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.138",
-      "mac": null,
+      "mac": "00:26:b9:3f:44:b3",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:44:b3",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
index b361c478b36c265a578f3a0eefed88f2ec1d53d1..763ae636e4606203a242a38013e42821b55efbc4 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-39.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.139",
-      "mac": null,
+      "mac": "00:26:b9:3f:4b:2f",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:4b:2f",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
index 07998958c54e3fcf9f2b714829a2d0d9fc879324..e73fa34bee3ba78c0daad28f510cfd0f56a5076c 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-4.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.104",
-      "mac": null,
+      "mac": "00:26:b9:3f:4a:6d",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:4a:6d",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
index 4fe9136ceb985354b8e2cdc8c95734a9a393efc7..2e514a369644c3f12ac6c3085871e2310b679fa2 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-40.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.140",
-      "mac": null,
+      "mac": "00:26:b9:3f:49:44",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:49:44",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
index df69b0645547b4b34083b16a888c74e158368250..153e6446ee9bb5f3acfbdac844bd337eeaab88ed 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-41.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.141",
-      "mac": null,
+      "mac": "00:26:b9:3f:45:3a",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:45:3a",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
index cc7466ef6c2bb24ee4bdbb64f17ba58e0ab9c31c..b7227afd8bb3d5301169a92d408710229f93dc1d 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-42.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.142",
-      "mac": null,
+      "mac": "00:26:b9:3f:41:21",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:41:21",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
index 7be9e2b832eba62c08062b9871f3284e890b5f24..579be178d4a243d6efa89b48eeb472999313a3bf 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-43.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.143",
-      "mac": null,
+      "mac": "00:26:b9:3f:3e:95",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:3e:95",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
index 1eb08bda16fc5d9efffb6951bdc51afe74d4f5c0..5d472f0e39d62b066f853a0432e99f3d216bdf8e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-44.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.144",
-      "mac": null,
+      "mac": "00:26:b9:3f:45:2e",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:45:2e",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
index 9693dee655602132de87b7ad9e988b81c3b46774..9e78db10fcbfdd32c76e9243b34a0b1b239b5da6 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-45.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.145",
-      "mac": null,
+      "mac": "00:26:b9:3f:47:7b",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:47:7b",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
index 6c11d9585854c04d3e2f8812affcc395e7ef0a76..6557c1dd306a3ec94a06f69a7e9a1952c6dc61a0 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-5.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.105",
-      "mac": null,
+      "mac": "00:26:b9:3e:e8:58",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3e:e8:58",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
index d09c450436a1c0b5b25af41fe65c53c8f5ee4928..3046dd6fe581e4ab9155e6fcc8d9726bc759085e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-6.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.106",
-      "mac": null,
+      "mac": "00:26:b9:3f:40:af",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:40:af",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
index 8612f4d0cfde245d17b0bf86f36f1f4d82b633b2..b13df9317561866051a4ab6bb2b49c079bf24a67 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-7.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.107",
-      "mac": null,
+      "mac": "00:26:b9:3f:43:a1",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:43:a1",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
index 9e1cb1db0640cd1f382758a5b219498ef6242df8..1ea1611fa6a55fa475c2040561c335d7603cd182 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-8.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.108",
-      "mac": null,
+      "mac": "00:26:b9:3f:4a:3d",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:4a:3d",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
index 5a66997605788542102e69462a5a5617a9b6c9d2..a064d83d8cf9fc1c4b34d5f10c3ccaff69d6cf8e 100644
--- a/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
+++ b/data/grid5000/sites/sophia/clusters/suno/nodes/suno-9.json
@@ -15,7 +15,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "138.96.21.109",
-      "mac": null,
+      "mac": "00:26:b9:3f:41:27",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -30,7 +30,7 @@
       "driver": "bnx2",
       "enabled": false,
       "interface": "Ethernet",
-      "mac": null,
+      "mac": "00:26:b9:3f:41:27",
       "rate": 1000000000,
       "vendor": "Broadcom",
       "version": "NetXtremeII BCM5716"
diff --git a/data/grid5000/sites/sophia/environments/sid-x64-base-1.0.json b/data/grid5000/sites/sophia/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f5666889a1c3447952d2ef846d177297..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/sid-x64-base-1.1.json b/data/grid5000/sites/sophia/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f30ebf993ecb9f571209108b7f2465..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/sid-x64-big-1.1.json b/data/grid5000/sites/sophia/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4910f0ce2ee266fa0a3cbc5c8e8026..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/sophia/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb89fe5ad72ec71d71f854a4c794912..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/sophia/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0fd8594a1d48d11529ed5620ecbb420..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/sophia/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/squeeze-x64-base-0.8.json b/data/grid5000/sites/sophia/environments/squeeze-x64-base-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..30b0a480400b40905271d51043768003e62cde82
--- /dev/null
+++ b/data/grid5000/sites/sophia/environments/squeeze-x64-base-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-base-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/squeeze-x64-big-0.8.json b/data/grid5000/sites/sophia/environments/squeeze-x64-big-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..f651be05618dcb7f2b8a6e1a53624a164aef6984
--- /dev/null
+++ b/data/grid5000/sites/sophia/environments/squeeze-x64-big-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-big-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/squeeze-x64-min-0.8.json b/data/grid5000/sites/sophia/environments/squeeze-x64-min-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..9006de5d2a4ceeebc8b7382fe52c6825a260994f
--- /dev/null
+++ b/data/grid5000/sites/sophia/environments/squeeze-x64-min-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-min-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/squeeze-x64-nfs-0.8.json b/data/grid5000/sites/sophia/environments/squeeze-x64-nfs-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..5185a0bb1ddf7c35393027250bf6959b6fd4dee8
--- /dev/null
+++ b/data/grid5000/sites/sophia/environments/squeeze-x64-nfs-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-nfs-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/sophia/environments/squeeze-x64-xen-0.8.json b/data/grid5000/sites/sophia/environments/squeeze-x64-xen-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..1812b44b1faddbc83cdeade8c1b7939e9b0918ae
--- /dev/null
+++ b/data/grid5000/sites/sophia/environments/squeeze-x64-xen-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-xen-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/lenny-x64-big-2.3.json b/data/grid5000/sites/toulouse/environments/lenny-x64-big-2.3.json
new file mode 120000
index 0000000000000000000000000000000000000000..854ea1f82086b27e25bf37b2bac87f8e46527475
--- /dev/null
+++ b/data/grid5000/sites/toulouse/environments/lenny-x64-big-2.3.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/lenny-x64-big-2.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/lenny-x64-min-0.8.json b/data/grid5000/sites/toulouse/environments/lenny-x64-min-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..b62b4a3b9cd5fec298f6db3aca0a6a58bf580c83
--- /dev/null
+++ b/data/grid5000/sites/toulouse/environments/lenny-x64-min-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/lenny-x64-min-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/lenny-x64-nfs-2.3.json b/data/grid5000/sites/toulouse/environments/lenny-x64-nfs-2.3.json
new file mode 120000
index 0000000000000000000000000000000000000000..76ed78e729d3c69e8f63d49fccf129ca1ab8e0ff
--- /dev/null
+++ b/data/grid5000/sites/toulouse/environments/lenny-x64-nfs-2.3.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/lenny-x64-nfs-2.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/lenny-x64-xen-2.3.json b/data/grid5000/sites/toulouse/environments/lenny-x64-xen-2.3.json
new file mode 120000
index 0000000000000000000000000000000000000000..49a15174194882afa6d8a9596439bf8dd33b3c0c
--- /dev/null
+++ b/data/grid5000/sites/toulouse/environments/lenny-x64-xen-2.3.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/lenny-x64-xen-2.3.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/sid-x64-base-1.0.json b/data/grid5000/sites/toulouse/environments/sid-x64-base-1.0.json
deleted file mode 120000
index 2b24c554f5666889a1c3447952d2ef846d177297..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/sid-x64-base-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/sid-x64-base-1.1.json b/data/grid5000/sites/toulouse/environments/sid-x64-base-1.1.json
deleted file mode 120000
index d68ac0f231f30ebf993ecb9f571209108b7f2465..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/sid-x64-base-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-base-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/sid-x64-big-1.1.json b/data/grid5000/sites/toulouse/environments/sid-x64-big-1.1.json
deleted file mode 120000
index 1f8e007d5b4910f0ce2ee266fa0a3cbc5c8e8026..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/sid-x64-big-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-big-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/sid-x64-nfs-1.0.json b/data/grid5000/sites/toulouse/environments/sid-x64-nfs-1.0.json
deleted file mode 120000
index 4af54a89ecb89fe5ad72ec71d71f854a4c794912..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/sid-x64-nfs-1.0.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.0.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/sid-x64-nfs-1.1.json b/data/grid5000/sites/toulouse/environments/sid-x64-nfs-1.1.json
deleted file mode 120000
index 0fae54b4b0fd8594a1d48d11529ed5620ecbb420..0000000000000000000000000000000000000000
--- a/data/grid5000/sites/toulouse/environments/sid-x64-nfs-1.1.json
+++ /dev/null
@@ -1 +0,0 @@
-../../../../grid5000/environments/sid-x64-nfs-1.1.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-base-0.8.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-base-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..30b0a480400b40905271d51043768003e62cde82
--- /dev/null
+++ b/data/grid5000/sites/toulouse/environments/squeeze-x64-base-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-base-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-big-0.8.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-big-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..f651be05618dcb7f2b8a6e1a53624a164aef6984
--- /dev/null
+++ b/data/grid5000/sites/toulouse/environments/squeeze-x64-big-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-big-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-min-0.8.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..9006de5d2a4ceeebc8b7382fe52c6825a260994f
--- /dev/null
+++ b/data/grid5000/sites/toulouse/environments/squeeze-x64-min-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-min-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-0.8.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..5185a0bb1ddf7c35393027250bf6959b6fd4dee8
--- /dev/null
+++ b/data/grid5000/sites/toulouse/environments/squeeze-x64-nfs-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-nfs-0.8.json
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-0.8.json b/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-0.8.json
new file mode 120000
index 0000000000000000000000000000000000000000..1812b44b1faddbc83cdeade8c1b7939e9b0918ae
--- /dev/null
+++ b/data/grid5000/sites/toulouse/environments/squeeze-x64-xen-0.8.json
@@ -0,0 +1 @@
+../../../../grid5000/environments/squeeze-x64-xen-0.8.json
\ No newline at end of file
diff --git a/generators/input/bordeaux.rb b/generators/input/bordeaux.rb
index e898bb15bfbfcc27a4de1983165ed9daf9ea0f27..52be5cdd5fa7df3d3e44b7e513f3e79af696a8f7 100755
--- a/generators/input/bordeaux.rb
+++ b/generators/input/bordeaux.rb
@@ -13,10 +13,10 @@ site :bordeaux do |site_uid|
   sys_admin_contact "bordeaux-staff@lists.grid5000.fr"
   security_contact "bordeaux-staff@lists.grid5000.fr"
   user_support_contact "bordeaux-staff@lists.grid5000.fr"
-  ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
-    %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+  ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
     %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
-    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
+    %w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
   
   cluster :bordeplage do |cluster_uid|
     model "Dell PowerEdge 1855"
diff --git a/generators/input/environments.rb b/generators/input/environments.rb
index 16be6de27f3819269fa5ad4d9dad039f3314844b..90c12aca57763dfccafc32f76a74f19848fa9167 100755
--- a/generators/input/environments.rb
+++ b/generators/input/environments.rb
@@ -1,5 +1,5 @@
 environment 'sid-x64-base-1.0' do
-  state "stable"
+  state "deprecated"
   file({:path => "/grid5000/images/sid-x64-base-1.0.tgz", :md5 => "e39be32c087f0c9777fd0b0ad7d12050"})
   valid_on "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100"
   kernel "2.6.18-8"
@@ -14,7 +14,7 @@ environment 'sid-x64-base-1.0' do
 end
 
 environment 'sid-x64-base-1.1' do
-  state "stable"
+  state "deprecated"
   file({:path => "/grid5000/images/sid-x64-base-1.1.tgz", :md5 => "756ccc2096e9feacde85500d33683dba"})
   valid_on "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, HP DL385G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100"
   kernel "2.6.24"
@@ -29,7 +29,7 @@ environment 'sid-x64-base-1.1' do
 end
 
 environment 'sid-x64-nfs-1.0' do
-  state "stable"
+  state "deprecated"
   file({:path => "/grid5000/images/sid-x64-nfs-1.0.tgz", :md5 => "6e004d1ac25e86a1dadc09d28f968eb5"})
   valid_on "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100"
   kernel "2.6.18-4"
@@ -44,7 +44,7 @@ environment 'sid-x64-nfs-1.0' do
 end
 
 environment 'sid-x64-nfs-1.1' do
-  state "stable"
+  state "deprecated"
   file({:path => "/grid5000/images/sid-x64-nfs-1.1.tgz", :md5 => "4218f5a9bfea4a759fa684db1ec4d89c"})
   valid_on "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100"
   kernel "2.6.24.3"
@@ -59,7 +59,7 @@ environment 'sid-x64-nfs-1.1' do
 end
 
 environment 'sid-x64-big-1.1' do
-  state "stable"
+  state "deprecated"
   file({:path => "/grid5000/images/sid-x64-big-1.1.tgz", :md5 => "d514bee74404ed5f64ff41b2f60c4f7f"})
   valid_on "Dell PE1855, Dell PE1950, HP DL140G3, HP DL145G2, IBM e325, IBM e326, IBM e326m, Sun V20z, Sun X2200 M2, Sun X4100"
   kernel "2.6.24.3"
@@ -469,7 +469,7 @@ environment 'lenny-x64-base-2.3' do
   state "stable"
   file({:path => "/grid5000/images/lenny-x64-base-2.3.tgz", :md5 => "3c255364f601fc19271783269ef541c2"})
   kernel "2.6.26.2"
-  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette"
+  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette"
   based_on "Debian version lenny for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
@@ -484,7 +484,7 @@ environment 'lenny-x64-big-2.3' do
   state "stable"
   file({:path => "/grid5000/images/lenny-x64-big-2.3.tgz", :md5 => "e5870c72c1a5386c287935dcf39a8a23"})
   kernel "2.6.26.2"
-  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette"
+  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette"
   based_on "Debian version lenny for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
@@ -499,7 +499,7 @@ environment 'lenny-x64-min-0.8' do
   state "stable"
   file({:path => "/grid5000/images/lenny-x64-min-0.8.tgz", :md5 => "a39dcad30821b7404d8eb5ac1388f650"})
   kernel "2.6.26.2"
-  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette"
+  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette"
   based_on "Debian version lenny for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
@@ -513,7 +513,7 @@ environment 'lenny-x64-nfs-2.3' do
   state "stable"
   file({:path => "/grid5000/images/lenny-x64-nfs-2.3.tgz", :md5 => "12522a436a2790df866f1ecd63680eff"})
   kernel "2.6.26.2"
-  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette"
+  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette"
   based_on "Debian version lenny for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
@@ -526,9 +526,39 @@ end
 
 environment 'lenny-x64-xen-2.3' do
   state "stable"
-  file({:path => "/grid5000/images/lenny-x64-xen-2.3.tgz", :md5 => "8e4f0eff055c61ed8a51265c1c9afd58"})
+  file({:path => "/grid5000/images/lenny-x64-xen-2.3.tgz", :md5 => "7ba173eb6b339fe0110d458d987ef10f"})
+  kernel "2.6.26.2"
+  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette"
+  based_on "Debian version lenny for amd64"
+  consoles [{:port => "ttyS0", :bps => 34800}]
+  services []
+  accounts [{:login => "root", :password => "grid5000"}]
+  applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
+  x11_forwarding true
+  max_open_files 8192
+  tcp_bandwidth 1.G
+end
+
+environment 'squeeze-x64-base-0.8' do
+  state "stable"
+  file({:path => "/grid5000/images/squeeze-x64-base-0.8.tgz", :md5 => "105bd08ea3f3bf4888d371c9a3241ee5"})
+  kernel "2.6.26.2"
+  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette"
+  based_on "Debian version lenny for amd64"
+  consoles [{:port => "ttyS0", :bps => 34800}]
+  services []
+  accounts [{:login => "root", :password => "grid5000"}]
+  applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
+  x11_forwarding true
+  max_open_files 8192
+  tcp_bandwidth 1.G
+end
+
+environment 'squeeze-x64-big-0.8' do
+  state "stable"
+  file({:path => "/grid5000/images/squeeze-x64-big-0.8.tgz", :md5 => "bf7dcdf526d4cda8a2d23d116e9b08fc"})
   kernel "2.6.26.2"
-  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , helios , sol , suno, pastel , violette"
+  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette"
   based_on "Debian version lenny for amd64"
   consoles [{:port => "ttyS0", :bps => 34800}]
   services []
@@ -539,3 +569,46 @@ environment 'lenny-x64-xen-2.3' do
   tcp_bandwidth 1.G
 end
 
+environment 'squeeze-x64-min-0.8' do
+  state "stable"
+  file({:path => "/grid5000/images/squeeze-x64-min-0.8.tgz", :md5 => "8aaaf11cb65279f0d747d2dd300fb3ce"})
+  kernel "2.6.26.2"
+  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette"
+  based_on "Debian version lenny for amd64"
+  consoles [{:port => "ttyS0", :bps => 34800}]
+  services []
+  accounts [{:login => "root", :password => "grid5000"}]
+  applications "Vim, nano, Perl".split(", ")
+  x11_forwarding true
+  tcp_bandwidth 1.G
+end
+
+environment 'squeeze-x64-nfs-0.8' do
+  state "stable"
+  file({:path => "/grid5000/images/squeeze-x64-nfs-0.8.tgz", :md5 => "49642989fa205b8f8e3366aaa149cf29"})
+  kernel "2.6.26.2"
+  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette"
+  based_on "Debian version lenny for amd64"
+  consoles [{:port => "ttyS0", :bps => 34800}]
+  services []
+  accounts [{:login => "root", :password => "grid5000"}]
+  applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
+  x11_forwarding true
+  max_open_files 8192
+  tcp_bandwidth 1.G
+end
+
+environment 'squeeze-x64-xen-0.8' do
+  state "stable"
+  file({:path => "/grid5000/images/squeeze-x64-xen-0.8.tgz", :md5 => "243961b600246379b1257b57c5905c68"})
+  kernel "2.6.26.2"
+  valid_on "bordeplage , bordereau , borderline ,  adonis , edel , genepi , chicon , chimint , chinqchint , chirloute , capricorne , sagittaire , graphene , griffon , gdx , netgdx , paradent , paramount , parapide , parapluie , helios , sol , suno, pastel , violette"
+  based_on "Debian version lenny for amd64"
+  consoles [{:port => "ttyS0", :bps => 34800}]
+  services []
+  accounts [{:login => "root", :password => "grid5000"}]
+  applications "Vim, XEmacs, JED, nano, JOE, Perl, Python, Ruby".split(", ")
+  x11_forwarding true
+  max_open_files 8192
+  tcp_bandwidth 1.G
+end
diff --git a/generators/input/grenoble.rb b/generators/input/grenoble.rb
index 682c2bf098ca2c5fab2b69c7eaac19a91640c55d..f793709e6c1be854b18d324280eb28d2ef3dd727 100755
--- a/generators/input/grenoble.rb
+++ b/generators/input/grenoble.rb
@@ -9,20 +9,20 @@ site :grenoble do |site_uid|
   sys_admin_contact
   security_contact
   user_support_contact
-  ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
-    %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+  ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
     %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
-    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
+    %w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
 
   cluster :genepi do |cluster_uid|
     model "Bull R422-E1"
     created_at Time.parse("2008-10-01").httpdate
-    
+
     34.times do |i|
       node "#{cluster_uid}-#{i+1}" do |node_uid|
         supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
         architecture({
-          :smp_size => 2, 
+          :smp_size => 2,
           :smt_size => 8,
           :platform_type => "x86_64"
           })
@@ -59,10 +59,10 @@ site :grenoble do |site_uid|
           :mounted => true,
           :management => false,
           :vendor => 'Mellanox',
-			 :version => "InfiniHost MHGH29-XTC",
+          :version => "InfiniHost MHGH29-XTC",
           :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
-			 :driver => "mlx4_core"
+          :driver => "mlx4_core"
         },
         {
           :interface => 'Ethernet',
@@ -71,8 +71,8 @@ site :grenoble do |site_uid|
           :enabled => false,
           :management => false,
           :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0'),
-			 :vendor => "Intel",
-			 :version => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
+          :vendor => "Intel",
+          :version => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)"
         },
         {
           :interface => 'Ethernet',
@@ -85,9 +85,9 @@ site :grenoble do |site_uid|
           :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
           :mac => lookup('grenoble', "#{node_uid}", 'mac_eth1'),
-			 :vendor => "Intel",
-			 :version => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)",
-			 :driver => "e1000e"
+          :vendor => "Intel",
+          :version => "Intel 80003ES2LAN Gigabit Ethernet Controller (Copper) (rev 01)",
+          :driver => "e1000e"
         },
         {
           :interface => 'Ethernet',
@@ -98,8 +98,8 @@ site :grenoble do |site_uid|
           :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
           :mac => lookup('grenoble', "#{node_uid}", 'mac_mgt'),
-			 :vendor => "Peppercon AG (10437)",
-			 :version => "1.50"
+          :vendor => "Peppercon AG (10437)",
+          :version => "1.50"
         }]
       end
     end
@@ -112,7 +112,7 @@ site :grenoble do |site_uid|
       node "#{cluster_uid}-#{i+1}" do |node_uid|
         supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
         architecture({
-          :smp_size => 2, 
+          :smp_size => 2,
           :smt_size => 8,
           :platform_type => "x86_64"
           })
@@ -149,10 +149,10 @@ site :grenoble do |site_uid|
           :mountable => true,
           :management => false,
           :vendor => 'Mellanox',
-			 :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+          :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+          :driver => "mlx4_core"
           :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
-			 :driver => "mlx4_core"
+          :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr")
         },
         {
           :interface => 'Ethernet',
@@ -162,12 +162,12 @@ site :grenoble do |site_uid|
           :mounted => true,
           :mountable => true,
           :management => false,
-	  		 :vendor => 'Intel',
-			 :version => "Device 10c9 (rev 01)",
+          :vendor => 'Intel',
+          :version => "Device 10c9 (rev 01)",
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
           :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0'),
-			 :driver => "igb"
+          :driver => "igb"
         },
         {
           :interface => 'Ethernet',
@@ -177,8 +177,8 @@ site :grenoble do |site_uid|
           :mountable => false,
           :mounted => false,
           :management => false,
-	  		 :vendor => 'Intel',
-			 :version => "Device 10c9 (rev 01)",
+          :vendor => 'Intel',
+          :version => "Device 10c9 (rev 01)",
           :mac => lookup('grenoble', "#{node_uid}", 'mac_eth1')
         },
         {
@@ -191,8 +191,8 @@ site :grenoble do |site_uid|
           :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
           :mac => lookup('grenoble', "#{node_uid}", 'mac_mgt'),
-	  		 :vendor => 'Super Micro Computer Inc.',
-			 :version => "1.15"
+          :vendor => 'Super Micro Computer Inc.',
+          :version => "1.15"
         }]
       end
     end
@@ -201,7 +201,7 @@ site :grenoble do |site_uid|
       node "#{cluster_uid}-#{i+11}" do |node_uid|
         supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
         architecture({
-          :smp_size => 2, 
+          :smp_size => 2,
           :smt_size => 8,
           :platform_type => "x86_64"
           })
@@ -238,10 +238,10 @@ site :grenoble do |site_uid|
           :mountable => true,
           :management => false,
           :vendor => 'Mellanox',
-			 :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
-          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-			 :driver => "mlx4_core"
+          :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s",
+          :driver => "mlx4_core"
+          :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
+          :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr")
         },
         {
           :interface => 'Ethernet',
@@ -251,8 +251,8 @@ site :grenoble do |site_uid|
           :mountable => true,
           :mounted => true,
           :management => false,
-	  		 :vendor => 'Intel',
-			 :version => "Device 10c9 (rev 01)",
+          :vendor => 'Intel',
+          :version => "Device 10c9 (rev 01)",
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
           :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0'),
@@ -266,8 +266,8 @@ site :grenoble do |site_uid|
           :mountable => false,
           :mounted => false,
           :management => false,
-	  		 :vendor => 'Intel',
-			 :version => "Device 10c9 (rev 01)",
+          :vendor => 'Intel',
+          :version => "Device 10c9 (rev 01)",
           :mac => lookup('grenoble', "#{node_uid}", 'mac_eth1')
         },
         {
@@ -279,9 +279,9 @@ site :grenoble do |site_uid|
           :mountable => true,
           :management => false,
           :vendor => 'Mellanox',
-			 :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s  (rev a0)",
+          :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s  (rev a0)",
           :ip => "",
-			 :driver => "mlx4_core"
+          :driver => "mlx4_core"
         },
         {
           :interface => 'Ethernet',
@@ -304,13 +304,12 @@ site :grenoble do |site_uid|
   cluster :edel do |cluster_uid|
     model "Bull bullx B500 compute blades"
     created_at Time.parse("2008-10-03").httpdate
-    
+
     72.times do |i|
       node "#{cluster_uid}-#{i+1}" do |node_uid|
-#        supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
-        supported_job_types({:deploy => true, :besteffort => true, :virtual => "false"})
+        supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
         architecture({
-          :smp_size => 2, 
+          :smp_size => 2,
           :smt_size => 8,
           :platform_type => "x86_64"
           })
@@ -347,10 +346,10 @@ site :grenoble do |site_uid|
           :mountable => true,
           :management => false,
           :vendor => 'Mellanox',
-			 :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)",
+          :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)",
           :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
-			 :driver => "mlx4_core"
+          :driver => "mlx4_core"
         },
         {
           :interface => 'InfiniBand',
@@ -361,9 +360,10 @@ site :grenoble do |site_uid|
           :mountable => true,
           :management => false,
           :vendor => 'Mellanox',
-			 :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)",
-			 :driver => "mlx4_core",
-			 :ip => ""
+          :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)",
+          :driver => "mlx4_core",
+          :ip => ""
+
         },
         {
           :interface => 'Ethernet',
@@ -376,21 +376,21 @@ site :grenoble do |site_uid|
           :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
           :mac => lookup('grenoble', "#{node_uid}", 'mac_eth0'),
-			 :vendor => "Intel",
-			 :version => "Device 10e7 (rev 01)",
-			 :driver => "igb"
+          :vendor => "Intel",
+          :version => "Device 10e7 (rev 01)",
+          :driver => "igb"
         },
         {
           :interface => 'Ethernet',
           :rate => 1.G,
-			 :device => "eth1",
+          :device => "eth1",
           :enabled => false,
           :mounted => false,
           :mountable => false,
           :management => false,
-			 :vendor => "Intel",
-			 :version => "Device 10e7 (rev 01)",
-			 :mac => lookup('grenoble', "#{node_uid}", 'mac_eth1')
+          :vendor => "Intel",
+          :version => "Device 10e7 (rev 01)",
+          :mac => lookup('grenoble', "#{node_uid}", 'mac_eth1')
         },
         {
           :interface => 'Ethernet',
@@ -402,10 +402,10 @@ site :grenoble do |site_uid|
           :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
           :ip => dns_lookup("#{node_uid}-bmc.#{site_uid}.grid5000.fr"),
           :mac => lookup('grenoble', "#{node_uid}", 'mac_mgt'),
-			 :vendor => "Unknown",
-			 :version => "1.7"
+          :vendor => "Unknown",
+          :version => "1.7"
         }]
-      end      
+      end
     end
   end
 end
diff --git a/generators/input/lille.rb b/generators/input/lille.rb
index 954fe7b5934bb8eb6643f4bb588be916def0628d..8e6ea5462a28231d91b44962fd795ce1690fa400 100755
--- a/generators/input/lille.rb
+++ b/generators/input/lille.rb
@@ -9,11 +9,184 @@ site :lille do |site_uid|
   sys_admin_contact
   security_contact
   user_support_contact
-  ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
-    %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-xen-1.0 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+  ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-xen-1.0 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
     %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-xen-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0}  +
-    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
-  
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
+    %w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+
+cluster :chirloute do |cluster_uid|
+    model "Dell PowerEdge C6100"
+    created_at Time.parse("2011-03-25").httpdate
+    8.times do |i|
+      node "#{cluster_uid}-#{i+1}" do |node_uid|
+        supported_job_types({:deploy => true, :besteffort => true, :virtual => false})
+        architecture({
+          :smp_size => 2,
+          :smt_size => 8,
+          :platform_type => "x86_64"
+          })                                                                                  
+        processor({
+          :vendor => "Intel",
+          :model => "Intel Xeon", 
+          :version => "E5620",
+          :clock_speed => 2.4.G,
+          :instruction_set => "",
+          :other_description => "",
+          :cache_l1 => nil, 
+          :cache_l1i => nil,
+          :cache_l1d => nil,
+          :cache_l2 => 12.MiB
+        })
+        main_memory({ 
+          :ram_size => 8.GiB, # bytes
+          :virtual_size => nil
+        })
+        operating_system({
+          :name => nil,
+          :release => nil,
+          :version => nil
+        })
+        storage_devices [
+          {:interface => 'SATA',
+           :size => 300.GB,
+           :driver => "mptsas",
+           :raid => "0"}
+          ]
+        network_adapters [{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => lookup('lille', node_uid, 'network_interfaces', 'eth0', 'mac'),
+            :vendor => 'Intel',
+            :version => '82576EB',
+            :enabled => true, 
+            :management => false,
+            :mountable => true,
+            :driver => 'igb',
+            :mounted => true,
+            :device => 'eth0',
+            :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
+            :switch => 'gw'
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => lookup('lille', node_uid, 'network_interfaces', 'eth1', 'mac'),
+            :vendor => 'Intel',
+            :version => '82576EB',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'igb',
+            :mounted => true,
+            :device => 'eth1',
+            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+            :switch => 'gw',
+            :switch_port => lookup('lille', node_uid, 'network_interfaces', 'eth1', 'switch_port')
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => lookup('lille', node_uid, 'network_interfaces', 'bmc', 'mac'),
+            :vendor => nil,
+            :version => nil,
+            :enabled => true,
+            :management => true,
+            :mountable => false,
+            :network_address => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-ipmi.#{site_uid}.grid5000.fr"),
+            :switch => 'gw'
+          }]
+      end
+    end
+  end # cluster chirloute
+
+  cluster :chimint do |cluster_uid|
+    model "Dell PowerEdge R410"
+    created_at Time.parse("2011-03-25").httpdate
+    20.times do |i|
+      node "#{cluster_uid}-#{i+1}" do |node_uid|
+        supported_job_types({:deploy => true, :besteffort => true, :virtual => false})
+        architecture({
+          :smp_size => 2,
+          :smt_size => 8,
+          :platform_type => "x86_64"
+          })
+        processor({
+          :vendor => "Intel",
+          :model => "Intel Xeon",
+          :version => "E5620",
+          :clock_speed => 2.4.G,
+          :instruction_set => "",
+          :other_description => "",
+          :cache_l1 => nil,
+          :cache_l1i => nil,
+          :cache_l1d => nil,
+          :cache_l2 => 12.MiB
+        })
+        main_memory({
+          :ram_size => 16.GiB, # bytes
+          :virtual_size => nil
+        })
+        operating_system({
+          :name => nil,
+          :release => nil,
+          :version => nil
+        })
+        storage_devices [
+          {:interface => 'SATA', 
+	   :size => 300.GB, 
+	   :driver => "megaraid_sas",
+	   :raid => "0"}
+          ]
+        network_adapters [{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => lookup('lille', node_uid, 'network_interfaces', 'eth0', 'mac'),
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme II BCM5716',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'bnx2',
+            :mounted => true,
+            :device => 'eth0',
+            :network_address => "#{node_uid}-eth0.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-eth0.#{site_uid}.grid5000.fr"),
+            :switch => 'gw'
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => lookup('lille', node_uid, 'network_interfaces', 'eth1', 'mac'),
+            :vendor => 'Broadcom',
+            :version => 'NetXtreme II BCM5716',
+            :enabled => true,
+            :management => false,
+            :mountable => true,
+            :driver => 'bnx2',
+            :mounted => true,
+            :device => 'eth1',
+            :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+            :switch => 'gw',
+	    :switch_port => lookup('lille', node_uid, 'network_interfaces', 'eth1', 'switch_port')
+          },{
+            :interface => 'Ethernet',
+            :rate => 1.G,
+            :mac => lookup('lille', node_uid, 'network_interfaces', 'bmc', 'mac'),
+            :vendor => nil,
+            :version => nil,
+            :enabled => true,
+            :management => true,
+            :mountable => false,
+            :network_address => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
+            :ip => dns_lookup("#{node_uid}-ipmi.#{site_uid}.grid5000.fr"),
+            :switch => 'gw'
+          }]
+      end
+    end
+  end # cluster chimint
+
+
   cluster :chicon do |cluster_uid|
     model "IBM eServer 326m"
     created_at nil
diff --git a/generators/input/lille.yaml b/generators/input/lille.yaml
index a3e19334252301de4bede9f35b6e20bee09bbe9c..5d3badcd1d06337866fcdb755bbc6c37ca2470e2 100644
--- a/generators/input/lille.yaml
+++ b/generators/input/lille.yaml
@@ -448,198 +448,6 @@ chinqchint-46:
   ip_mgt: 192.168.161.145
   mac_mgt: 00:30:48:96:08:02
   switch_port: Gi3/41
-chti-1:
-  mac_eth0: 00:11:25:c4:50:c0
-  ip_eth0: 192.168.160.54
-  mac_eth1: 00:11:25:c4:50:c1
-  ip_eth1: 192.168.159.54
-  mac_myri0: 00:60:dd:47:4b:41
-  ip_myri0: 192.168.162.54
-  ip_mgt: 192.168.158.54
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/14
-chti-2:
-  mac_eth0: 00:11:25:c4:54:08
-  ip_eth0: 192.168.160.55
-  mac_eth1: 00:11:25:c4:54:09
-  ip_eth1: 192.168.159.55
-  mac_myri0: 00:60:dd:47:4c:d3
-  ip_myri0: 192.168.162.55
-  ip_mgt: 192.168.158.55
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/15
-chti-3:
-  mac_eth0: 00:11:25:c4:4f:2a
-  ip_eth0: 192.168.160.56
-  mac_eth1: 00:11:25:c4:4f:2b
-  ip_eth1: 192.168.159.56
-  mac_myri0: 00:60:dd:47:4c:ce
-  ip_myri0: 192.168.162.56
-  ip_mgt: 192.168.158.56
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/16
-chti-4:
-  mac_eth0: 00:11:25:c4:54:2c
-  ip_eth0: 192.168.160.57
-  mac_eth1: 00:11:25:c4:54:2d
-  ip_eth1: 192.168.159.57
-  mac_myri0: 00:60:dd:47:49:a1
-  ip_myri0: 192.168.162.57
-  ip_mgt: 192.168.158.57
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/17
-chti-5:
-  mac_eth0: 00:11:25:c4:50:10
-  ip_eth0: 192.168.160.58
-  mac_eth1: 00:11:25:c4:50:11
-  ip_eth1: 192.168.159.58
-  mac_myri0: 00:60:dd:47:4c:cf
-  ip_myri0: 192.168.162.58
-  ip_mgt: 192.168.158.58
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/18
-chti-6:
-  mac_eth0: 00:11:25:c4:52:7a
-  ip_eth0: 192.168.160.59
-  mac_eth1: 00:11:25:c4:52:7b
-  ip_eth1: 192.168.159.59
-  mac_myri0: 00:60:dd:47:49:a4
-  ip_myri0: 192.168.162.59
-  ip_mgt: 192.168.158.59
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/19
-chti-7:
-  mac_eth0: 00:11:25:c4:50:c6
-  ip_eth0: 192.168.160.60
-  mac_eth1: 00:11:25:c4:50:c7
-  ip_eth1: 192.168.159.60
-  mac_myri0: 00:60:dd:47:49:ad
-  ip_myri0: 192.168.162.60
-  ip_mgt: 192.168.158.60
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/20
-chti-8:
-  mac_eth0: 00:11:25:c4:45:56
-  ip_eth0: 192.168.160.61
-  mac_eth1: 00:11:25:c4:45:57
-  ip_eth1: 192.168.159.61
-  mac_myri0: 00:60:dd:47:4b:b7
-  ip_myri0: 192.168.162.61
-  ip_mgt: 192.168.158.61
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/21
-chti-9:
-  mac_eth0: 00:11:25:c4:51:0e
-  ip_eth0: 192.168.160.62
-  mac_eth1: 00:11:25:c4:51:0f
-  ip_eth1: 192.168.159.62
-  mac_myri0: 00:60:dd:47:4b:b5
-  ip_myri0: 192.168.162.62
-  ip_mgt: 192.168.158.62
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/22
-chti-10:
-  mac_eth0: 00:11:25:c4:49:fe
-  ip_eth0: 192.168.160.63
-  mac_eth1: 00:11:25:c4:49:ff
-  ip_eth1: 192.168.159.63
-  mac_myri0: 00:60:dd:47:49:cf
-  ip_myri0: 192.168.162.63
-  ip_mgt: 192.168.158.63
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/24
-chti-11:
-  mac_eth0: 00:11:25:c4:54:40
-  ip_eth0: 192.168.160.64
-  mac_eth1: 00:11:25:c4:54:41
-  ip_eth1: 192.168.159.64
-  mac_myri0: 00:60:dd:47:4b:a8
-  ip_myri0: 192.168.162.64
-  ip_mgt: 192.168.158.64
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/23
-chti-12:
-  mac_eth0: 00:11:25:c4:50:78
-  ip_eth0: 192.168.160.65
-  mac_eth1: 00:11:25:c4:50:79
-  ip_eth1: 192.168.159.65
-  mac_myri0: 00:60:dd:47:4c:cc
-  ip_myri0: 192.168.162.65
-  ip_mgt: 192.168.158.65
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/25
-chti-13:
-  mac_eth0: 00:11:25:c4:53:14
-  ip_eth0: 192.168.160.66
-  mac_eth1: 00:11:25:c4:53:15
-  ip_eth1: 192.168.159.66
-  mac_myri0: 00:60:dd:47:4b:a1
-  ip_myri0: 192.168.162.66
-  ip_mgt: 192.168.158.66
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/26
-chti-14:
-  switch_port: Gi3/27
-chti-15:
-  mac_eth0: 00:11:25:c4:50:a0
-  ip_eth0: 192.168.160.68
-  mac_eth1: 00:11:25:c4:50:a1
-  ip_eth1: 192.168.159.68
-  mac_myri0: 00:60:dd:47:4c:d0
-  ip_myri0: 192.168.162.68
-  ip_mgt: 192.168.158.68
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/28
-chti-16:
-  mac_eth0: 00:11:25:c4:4e:84
-  ip_eth0: 192.168.160.69
-  mac_eth1: 00:11:25:c4:4e:85
-  ip_eth1: 192.168.159.69
-  mac_myri0: 00:60:dd:47:49:9c
-  ip_myri0: 192.168.162.69
-  ip_mgt: 192.168.158.69
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/29
-chti-17:
-  mac_eth0: 00:11:25:c4:52:12
-  ip_eth0: 192.168.160.70
-  mac_eth1: 00:11:25:c4:52:13
-  ip_eth1: 192.168.159.70
-  mac_myri0: 00:60:dd:47:4c:d4
-  ip_myri0: 192.168.162.70
-  ip_mgt: 192.168.158.70
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/30
-chti-18:
-  mac_eth0: 00:11:25:c4:50:1c
-  ip_eth0: 192.168.160.71
-  mac_eth1: 00:11:25:c4:50:1d
-  ip_eth1: 192.168.159.71
-  mac_myri0: 00:60:dd:47:4b:43
-  ip_myri0: 192.168.162.71
-  ip_mgt: 192.168.158.71
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/31
-chti-19:
-  mac_eth0: 00:11:25:c4:52:0c
-  ip_eth0: 192.168.160.72
-  mac_eth1: 00:11:25:c4:52:0d
-  ip_eth1: 192.168.159.72
-  mac_myri0: 00:60:dd:47:4b:45
-  ip_myri0: 192.168.162.72
-  ip_mgt: 192.168.158.72
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/32
-chti-20:
-  mac_eth0: 00:11:25:c4:52:2c
-  ip_eth0: 192.168.160.73
-  mac_eth1: 00:11:25:c4:52:2d
-  ip_eth1: 192.168.159.73
-  mac_myri0: 00:60:dd:47:4c:dd
-  ip_myri0: 192.168.162.73
-  ip_mgt: 192.168.158.73
-  mac_mgt: 00:19:A9:9F:48:C0
-  switch_port: Gi3/33
 chicon-1:
   mac_eth0: 00:11:25:c4:d4:a0
   ip_eth0: 192.168.160.74
@@ -900,199 +708,675 @@ chicon-26:
   ip_mgt: 192.168.158.99
   mac_mgt: 00:19:A9:9F:48:C0
   switch_port: Gi4/19
-chuque-1:
-  mac_eth0: 00:11:25:1e:28:b8
-  ip_eth0: 192.168.160.1
-  mac_eth1: 00:11:25:1e:28:b9
-  ip_eth1: 192.168.159.1
-  ip_mgt: 192.168.158.1
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-3:
-  mac_eth0: 00:11:25:1e:28:3c
-  ip_eth0: 192.168.160.3
-  mac_eth1: 00:11:25:1e:28:3d
-  ip_eth1: 192.168.159.3
-  ip_mgt: 192.168.158.3
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-4:
-  mac_eth0: 00:11:25:1e:29:92
-  ip_eth0: 192.168.160.4
-  mac_eth1: 00:11:25:1e:29:93
-  ip_eth1: 192.168.159.4
-  ip_mgt: 192.168.158.4
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-5:
-  mac_eth0: 00:11:25:1e:28:8c
-  ip_eth0: 192.168.160.5
-  mac_eth1: 00:11:25:1e:28:8d
-  ip_eth1: 192.168.159.5
-  ip_mgt: 192.168.158.5
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-6:
-  mac_eth0: 00:11:25:1e:28:96
-  ip_eth0: 192.168.160.6
-  mac_eth1: 00:11:25:1e:28:97
-  ip_eth1: 192.168.159.6
-  ip_mgt: 192.168.158.6
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-7:
-  mac_eth0: 00:11:25:1e:28:42
-  ip_eth0: 192.168.160.7
-  mac_eth1: 00:11:25:1e:28:43
-  ip_eth1: 192.168.159.7
-  ip_mgt: 192.168.158.7
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-8:
-  mac_eth0: 00:11:25:1e:28:9c
-  ip_eth0: 192.168.160.8
-  mac_eth1: 00:11:25:1e:28:9d
-  ip_eth1: 192.168.159.8
-  ip_mgt: 192.168.158.8
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-9:
-  mac_eth0: 00:11:25:1e:28:0e
-  ip_eth0: 192.168.160.9
-  mac_eth1: 00:11:25:1e:28:0f
-  ip_eth1: 192.168.159.9
-  ip_mgt: 192.168.158.9
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-10:
-  mac_eth0: 00:11:25:1e:28:a2
-  ip_eth0: 192.168.160.10
-  mac_eth1: 00:11:25:1e:28:a3
-  ip_eth1: 192.168.159.10
-  ip_mgt: 192.168.158.10
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-11:
-  mac_eth0: 00:11:25:1e:28:52
-  ip_eth0: 192.168.160.11
-  mac_eth1: 00:11:25:1e:28:53
-  ip_eth1: 192.168.159.11
-  ip_mgt: 192.168.158.11
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-12:
-  mac_eth0: 00:11:25:1e:28:b2
-  ip_eth0: 192.168.160.12
-  mac_eth1: 00:11:25:1e:28:b3
-  ip_eth1: 192.168.159.12
-  ip_mgt: 192.168.158.12
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-13:
-  mac_eth0: 00:11:25:1e:28:ac
-  ip_eth0: 192.168.160.13
-  mac_eth1: 00:11:25:1e:28:ad
-  ip_eth1: 192.168.159.13
-  ip_mgt: 192.168.158.13
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-14:
-  mac_eth0: 00:11:25:1e:28:46
-  ip_eth0: 192.168.160.14
-  mac_eth1: 00:11:25:1e:28:47
-  ip_eth1: 192.168.159.14
-  ip_mgt: 192.168.158.14
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-15:
-  mac_eth0: 00:11:25:1e:28:c4
-  ip_eth0: 192.168.160.15
-  mac_eth1: 00:11:25:1e:28:c5
-  ip_eth1: 192.168.159.15
-  ip_mgt: 192.168.158.15
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-17:
-  mac_eth0: 00:11:25:1e:28:c8
-  ip_eth0: 192.168.160.17
-  mac_eth1: 00:11:25:1e:28:c9
-  ip_eth1: 192.168.159.17
-  ip_mgt: 192.168.158.17
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-18:
-  mac_eth0: 00:11:25:1e:28:a0
-  ip_eth0: 192.168.160.18
-  mac_eth1: 00:11:25:1e:28:a1
-  ip_eth1: 192.168.159.18
-  ip_mgt: 192.168.158.18
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-20:
-  mac_eth0: 00:11:25:1e:2a:56
-  ip_eth0: 192.168.160.20
-  mac_eth1: 00:11:25:1e:2a:57
-  ip_eth1: 192.168.159.20
-  ip_mgt: 192.168.158.20
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-21:
-  mac_eth0: 00:11:25:1e:29:b2
-  ip_eth0: 192.168.160.21
-  mac_eth1: 00:11:25:1e:29:b3
-  ip_eth1: 192.168.159.21
-  ip_mgt: 192.168.158.21
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-43:
-  mac_eth0: 00:11:25:1e:2a:4c
-  ip_eth0: 192.168.160.43
-  mac_eth1: 00:11:25:1e:2a:4d
-  ip_eth1: 192.168.159.43
-  ip_mgt: 192.168.158.43
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-44:
-  mac_eth0: 00:11:25:1e:29:80
-  ip_eth0: 192.168.160.44
-  mac_eth1: 00:11:25:1e:29:81
-  ip_eth1: 192.168.159.44
-  ip_mgt: 192.168.158.44
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-45:
-  mac_eth0: 00:11:25:1e:29:a0
-  ip_eth0: 192.168.160.45
-  mac_eth1: 00:11:25:1e:29:a1
-  ip_eth1: 192.168.159.45
-  ip_mgt: 192.168.158.45
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-46:
-  mac_eth0: 00:11:25:1e:29:94
-  ip_eth0: 192.168.160.46
-  mac_eth1: 00:11:25:1e:29:95
-  ip_eth1: 192.168.159.46
-  ip_mgt: 192.168.158.46
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-47:
-  mac_eth0: 00:11:25:1e:29:aa
-  ip_eth0: 192.168.160.47
-  mac_eth1: 00:11:25:1e:29:ab
-  ip_eth1: 192.168.159.47
-  ip_mgt: 192.168.158.47
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-48:
-  mac_eth0: 00:11:25:1e:29:82
-  ip_eth0: 192.168.160.48
-  mac_eth1: 00:11:25:1e:29:83
-  ip_eth1: 192.168.159.48
-  ip_mgt: 192.168.158.48
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-49:
-  mac_eth0: 00:11:25:1e:28:b6
-  ip_eth0: 192.168.160.49
-  mac_eth1: 00:11:25:1e:28:b7
-  ip_eth1: 192.168.159.49
-  ip_mgt: 192.168.158.49
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-51:
-  mac_eth0: 00:11:25:1e:2a:68
-  ip_eth0: 192.168.160.51
-  mac_eth1: 00:11:25:1e:2a:69
-  ip_eth1: 192.168.159.51
-  ip_mgt: 192.168.158.51
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-52:
-  mac_eth0: 00:11:25:1e:29:a4
-  ip_eth0: 192.168.160.52
-  mac_eth1: 00:11:25:1e:29:a5
-  ip_eth1: 192.168.159.52
-  ip_mgt: 192.168.158.52
-  mac_mgt: 00:19:A9:9F:48:C0
-chuque-53:
-  mac_eth0: 00:11:25:1e:2a:60
-  ip_eth0: 192.168.160.53
-  mac_eth1: 00:11:25:1e:2a:61
-  ip_eth1: 192.168.159.53
-  ip_mgt: 192.168.158.53
-  mac_mgt: 00:19:A9:9F:48:C0
+chirloute-1: 
+  bios: 
+    version: 1.44.00
+    vendor: Inventec
+    release_date: 05/08/2010
+  network_interfaces: 
+    bmc: 
+      mac: 00:26:6c:f9:18:e6 
+    eth0: 
+      mac: 00:26:6c:f9:18:e4
+      ip: 192.168.160.21
+    eth1: 
+      mac: 00:26:6c:f9:18:e5
+      ip: 192.168.159.21
+  chassis: 
+    serial_number: D385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_device: 
+    sda: 
+      model: ST3300657SS
+      size: "585937500"
+      rev: ES64
+      vendor: SEAGATE
+chirloute-2: 
+  bios: 
+    version: 1.49.00
+    vendor: Dell Inc.
+    release_date: 09/14/2010
+  network_interfaces: 
+    bmc: 
+      mac: 00:26:6c:f9:17:ea
+    eth0: 
+      mac: 00:26:6c:f9:17:e8
+      ip: 192.168.160.22
+    eth1: 
+      mac: 00:26:6c:f9:17:e9
+      ip: 192.168.159.22
+  chassis: 
+    serial_number: D385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_device: 
+    sda: 
+      model: ST3300657SS
+      size: "585937500"
+      rev: ES64
+      vendor: SEAGATE
+chirloute-3: 
+  bios: 
+    version: 1.49.00
+    vendor: Dell Inc.
+    release_date: 09/14/2010
+  network_interfaces: 
+    bmc: 
+      mac: 00:26:6c:f9:15:72
+    eth0: 
+      mac: 00:26:6c:f9:15:70
+      ip: 192.168.160.23
+    eth1: 
+      mac: 00:26:6c:f9:15:71
+      ip: 192.168.159.23
+  chassis: 
+    serial_number: D385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_device: 
+    sda: 
+      model: ST3300657SS
+      size: "585937500"
+      rev: ES64
+      vendor: SEAGATE
+chirloute-4: 
+  bios: 
+    version: 1.49.00
+    vendor: Dell Inc.
+    release_date: 09/14/2010
+  network_interfaces: 
+    bmc: 
+      mac: 00:26:6c:f9:19:62
+    eth0: 
+      mac: 00:26:6c:f9:19:60
+      ip: 192.168.160.24
+    eth1: 
+      mac: 00:26:6c:f9:19:61
+      ip: 192.168.159.24
+  chassis: 
+    serial_number: D385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_device: 
+    sda: 
+      model: ST3300657SS
+      size: "585937500"
+      rev: ES64
+      vendor: SEAGATE
+chirloute-5: 
+  bios: 
+    version: 1.49.00
+    vendor: Dell Inc.
+    release_date: 09/14/2010
+  network_interfaces: 
+    bmc: 
+      mac: 00:26:6c:f9:16:0a
+    eth0: 
+      mac: 00:26:6c:f9:16:08
+      ip: 192.168.160.25
+    eth1: 
+      mac: 00:26:6c:f9:16:09
+      ip: 192.168.159.25
+  chassis: 
+    serial_number: F385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_device: 
+    sda: 
+      model: ST3300657SS
+      size: "585937500"
+      rev: ES64
+      vendor: SEAGATE
+chirloute-6: 
+  bios: 
+    version: 1.49.00
+    vendor: Dell Inc.
+    release_date: 09/14/2010
+  network_interfaces: 
+    bmc: 
+      mac: 00:26:6c:f9:17:22
+    eth0: 
+      mac: 00:26:6c:f9:17:20
+      ip: 192.168.160.26
+    eth1: 
+      mac: 00:26:6c:f9:17:21
+      ip: 192.168.159.26
+  chassis: 
+    serial_number: F385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_device: 
+    sda: 
+      model: ST3300657SS
+      size: "585937500"
+      rev: ES64
+      vendor: SEAGATE
+chirloute-7: 
+  bios: 
+    version: 1.49.00
+    vendor: Dell Inc.
+    release_date: 09/14/2010
+  network_interfaces: 
+    bmc: 
+      mac: 00:26:6c:f9:17:b9
+    eth0: 
+      mac: 00:26:6c:f9:17:b8
+      ip: 192.168.160.27
+    eth1: 
+      mac: 00:26:6c:f9:17:b9
+      ip: 192.168.159.27
+  chassis: 
+    serial_number: F385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_device: 
+    sda: 
+      model: ST3300657SS
+      size: "585937500"
+      rev: ES64
+      vendor: SEAGATE
+chirloute-8: 
+  bios: 
+    version: 1.49.00
+    vendor: Dell Inc.
+    release_date: 09/14/2010
+  network_interfaces: 
+    bmc: 
+      mac: 00:26:6c:f9:19:82
+    eth0: 
+      mac: 00:26:6c:f9:19:80
+      ip: 192.168.160.28
+    eth1: 
+      mac: 00:26:6c:f9:19:81
+      ip: 192.168.159.28
+  chassis: 
+    serial_number: F385Z4J
+    manufacturer: Dell
+    product_name: C6100
+  block_device: 
+    sda: 
+      model: ST3300657SS
+      size: "585937500"
+      rev: ES64
+      vendor: SEAGATE
+chimint-1: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:72:d4:81
+    eth0: 
+      mac: 84:2b:2b:72:d4:7f
+      ip: 192.168.160.1
+    eth1: 
+      mac: 84:2b:2b:72:d4:80
+      ip: 192.168.159.1
+  chassis: 
+    serial_number: DQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-2: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:70:4f:4e
+    eth0: 
+      mac: 84:2b:2b:70:4f:4c
+      ip: 192.168.160.2
+    eth1: 
+      mac: 84:2b:2b:70:4f:4d
+      ip: 192.168.159.2
+  chassis: 
+    serial_number: 8RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-3: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:70:4e:20
+    eth0: 
+      mac: 84:2b:2b:70:4e:1e
+      ip: 192.168.160.3
+    eth1: 
+      mac: 84:2b:2b:70:4e:1f
+      ip: 192.168.159.3
+  chassis: 
+    serial_number: 2RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-4: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:70:cc:8b
+    eth0: 
+      mac: 84:2b:2b:70:cc:89
+      ip: 192.168.160.4
+    eth1: 
+      mac: 84:2b:2b:70:cc:8a
+      ip: 192.168.159.4
+  chassis: 
+    serial_number: 3RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-5: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:70:cc:94
+    eth0: 
+      mac: 84:2b:2b:70:cc:92
+      ip: 192.168.160.5
+    eth1: 
+      mac: 84:2b:2b:70:cc:93
+      ip: 192.168.159.5
+  chassis: 
+    serial_number: 6RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-6: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:72:d5:a0
+    eth0: 
+      mac: 84:2b:2b:72:d5:9e
+      ip: 192.168.160.6
+    eth1: 
+      mac: 84:2b:2b:72:d5:9f
+      ip: 192.168.159.6
+  chassis: 
+    serial_number: FQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-7: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:72:b3:46
+    eth0: 
+      mac: 84:2b:2b:72:b3:44
+      ip: 192.168.160.7
+    eth1: 
+      mac: 84:2b:2b:72:b3:45
+      ip: 192.168.159.7
+  chassis: 
+    serial_number: 5RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-8: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:72:da:c5
+    eth0: 
+      mac: 84:2b:2b:72:da:c3
+      ip: 192.168.160.8
+    eth1: 
+      mac: 84:2b:2b:72:da:c4
+      ip: 192.168.159.8
+  chassis: 
+    serial_number: CRM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-9: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:72:cb:e5
+    eth0: 
+      mac: 84:2b:2b:72:cb:e3
+      ip: 192.168.160.9
+    eth1: 
+      mac: 84:2b:2b:72:cb:e4
+      ip: 192.168.159.9
+  chassis: 
+    serial_number: 4RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-10: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:72:d4:4b
+    eth0: 
+      mac: 84:2b:2b:72:d4:49
+      ip: 192.168.160.10
+    eth1: 
+      mac: 84:2b:2b:72:d4:4a
+      ip: 192.168.159.10
+  chassis: 
+    serial_number: 9QM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-11: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:70:c9:9f
+    eth0: 
+      mac: 84:2b:2b:70:c9:9d
+      ip: 192.168.160.11
+    eth1: 
+      mac: 84:2b:2b:70:c9:9e
+      ip: 192.168.159.11
+  chassis: 
+    serial_number: BRM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-12: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:72:d5:ec
+    eth0: 
+      mac: 84:2b:2b:72:d5:ea
+      ip: 192.168.160.12
+    eth1: 
+      mac: 84:2b:2b:72:d5:eb
+      ip: 192.168.159.12
+  chassis: 
+    serial_number: BQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-13: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:71:f1:26
+    eth0: 
+      mac: 84:2b:2b:71:f1:24
+      ip: 192.168.160.13
+    eth1: 
+      mac: 84:2b:2b:71:f1:25
+      ip: 192.168.159.13
+  chassis: 
+    serial_number: 9RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-14: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:72:d5:69
+    eth0: 
+      mac: 84:2b:2b:72:d5:67
+      ip: 192.168.160.14
+    eth1: 
+      mac: 84:2b:2b:72:d5:68
+      ip: 192.168.159.14
+  chassis: 
+    serial_number: CQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-15: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:72:d7:7c
+    eth0: 
+      mac: 84:2b:2b:72:d7:7a
+      ip: 192.168.160.15
+    eth1: 
+      mac: 84:2b:2b:72:d7:7b
+      ip: 192.168.159.15
+  chassis: 
+    serial_number: HQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-16: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:72:d5:dd
+    eth0: 
+      mac: 84:2b:2b:72:d5:db
+      ip: 192.168.160.16
+    eth1: 
+      mac: 84:2b:2b:72:d5:dc
+      ip: 192.168.159.16
+  chassis: 
+    serial_number: JQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-17: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:70:f6:94
+    eth0: 
+      mac: 84:2b:2b:70:f6:92
+      ip: 192.168.160.17
+    eth1: 
+      mac: 84:2b:2b:70:f6:93
+      ip: 192.168.159.17
+  chassis: 
+    serial_number: 8QM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-18: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:72:d7:8b
+    eth0: 
+      mac: 84:2b:2b:72:d7:89
+      ip: 192.168.160.18
+    eth1: 
+      mac: 84:2b:2b:72:d7:8a
+      ip: 192.168.159.18
+  chassis: 
+    serial_number: GQM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-19: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:70:c6:23
+    eth0: 
+      mac: 84:2b:2b:70:c6:21
+      ip: 192.168.160.19
+    eth1: 
+      mac: 84:2b:2b:70:c6:22
+      ip: 192.168.159.19
+  chassis: 
+    serial_number: 1RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
+chimint-20: 
+  bios: 
+    version: 1.5.3
+    vendor: Dell Inc.
+    release_date: 10/22/2010
+  network_interfaces: 
+    bmc: 
+      mac: 84:2b:2b:70:c3:d7
+    eth0: 
+      mac: 84:2b:2b:70:c3:d5
+      ip: 192.168.160.20
+    eth1: 
+      mac: 84:2b:2b:70:c3:d6
+      ip: 192.168.159.20
+  chassis: 
+    serial_number: 7RM1Z4J
+    manufacturer: Dell Inc.
+    product_name: PowerEdge R410
+  block_device: 
+    sda: 
+      model: PERC H700
+      size: "570949632"
+      rev: "2.10"
+      vendor: DELL
diff --git a/generators/input/lyon.rb b/generators/input/lyon.rb
index e9abb2c801da67557415ebbe431a76b5f8717d62..78553092cb7d864abbd4d4fd78410c46ef352210 100755
--- a/generators/input/lyon.rb
+++ b/generators/input/lyon.rb
@@ -9,10 +9,10 @@ site :lyon do |site_uid|
   sys_admin_contact
   security_contact
   user_support_contact
-  ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
-    %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+  ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
     %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
-    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
+    %w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
   
   cluster :capricorne do |cluster_uid|
     model "IBM eServer 325"
@@ -79,13 +79,13 @@ site :lyon do |site_uid|
           },{       
             :interface => 'Myrinet',
             :rate => 2.G,
-            :mac => '',
+            :mac => lookup('lyon',"#{node_uid}", 'mac_myri0'),
             :vendor => 'Myrinet',
             :version => "M3F-PCIXF-2",
             :enabled => true,
             :management => false,
             :mountable => true,
-            :driver => '',
+            :driver => 'mx',
             :mounted => false,
             :network_address => "#{node_uid}-myri0.#{site_uid}.grid5000.fr",
             :device => 'myri0',
diff --git a/generators/input/lyon.yaml b/generators/input/lyon.yaml
index a29e5cc8c9a498d402dc9433fb3a28768b7ac966..333ef7a3919d924c97373d54a272804b6e8880d1 100644
--- a/generators/input/lyon.yaml
+++ b/generators/input/lyon.yaml
@@ -5,6 +5,8 @@ capricorne-9:
   ip_eth1: 10.69.0.9
   ip_mgt: 10.69.136.9
   mac_mgt: 00:11:25:91:44:a5
+  mac_myri0: 00:60:dd:48:5f:db
+  ip_myri0: 10.69.8.9
 capricorne-10:
   mac_eth0: 00:0d:60:14:a3:2c
   ip_eth0: ""
@@ -12,6 +14,8 @@ capricorne-10:
   ip_eth1: 10.69.0.10
   ip_mgt: 10.69.136.10
   mac_mgt: 00:09:6b:9e:3f:c5
+  mac_myri0: 00:60:dd:48:60:45
+  ip_myri0: 10.69.8.10
 capricorne-11:
   mac_eth0: 00:11:25:1e:79:28
   ip_eth0: ""
@@ -19,6 +23,8 @@ capricorne-11:
   ip_eth1: 10.69.0.11
   ip_mgt: 10.69.136.11
   mac_mgt: 00:11:25:91:44:76
+  mac_myri0: 00:60:dd:48:5f:ef
+  ip_myri0: 10.69.8.11
 capricorne-12:
   mac_eth0: 00:0d:60:14:9f:96
   ip_eth0: ""
@@ -26,6 +32,8 @@ capricorne-12:
   ip_eth1: 10.69.0.12
   ip_mgt: 10.69.136.12
   mac_mgt: 00:11:25:91:45:73
+  mac_myri0: 00:60:dd:48:60:4d
+  ip_myri0: 10.69.8.12
 capricorne-13:
   mac_eth0: 00:11:25:1e:78:dc
   ip_eth0: ""
@@ -33,6 +41,8 @@ capricorne-13:
   ip_eth1: 10.69.0.13
   ip_mgt: 10.69.136.13
   mac_mgt: 00:11:25:91:44:90
+  mac_myri0: 00:60:dd:48:60:4b
+  ip_myri0: 10.69.8.13
 capricorne-14:
   mac_eth0: 00:0d:60:14:a0:f0
   ip_eth0: ""
@@ -40,6 +50,8 @@ capricorne-14:
   ip_eth1: 10.69.0.14
   ip_mgt: 10.69.136.14
   mac_mgt: 00:11:25:91:44:71
+  mac_myri0: 00:60:dd:48:60:4a
+  ip_myri0: 10.69.8.13
 capricorne-15:
   mac_eth0: 00:11:25:1e:79:32
   ip_eth0: ""
@@ -47,6 +59,8 @@ capricorne-15:
   ip_eth1: 10.69.0.15
   ip_mgt: 10.69.136.15
   mac_mgt: 00:11:25:91:44:5c
+  mac_myri0:
+  ip_myri0: 10.69.8.13
 capricorne-17:
   mac_eth0: 00:11:25:1e:79:1c
   ip_eth0: ""
@@ -54,6 +68,8 @@ capricorne-17:
   ip_eth1: 10.69.0.17
   ip_mgt: 10.69.136.17
   mac_mgt: 00:11:25:91:44:3c
+  mac_myri0:
+  ip_myri0: 10.69.8.13
 capricorne-18:
   mac_eth0: 00:0d:60:14:9f:3c
   ip_eth0: ""
@@ -61,6 +77,8 @@ capricorne-18:
   ip_eth1: 10.69.0.18
   ip_mgt: 10.69.136.18
   mac_mgt: 00:11:25:91:44:55
+  mac_myri0: 00:60:dd:48:60:35
+  ip_myri0: 10.69.8.13
 capricorne-19:
   mac_eth0: 00:0d:60:14:a3:4e
   ip_eth0: ""
@@ -68,6 +86,8 @@ capricorne-19:
   ip_eth1: 10.69.0.19
   ip_mgt: 10.69.136.19
   mac_mgt: 00:11:25:91:44:18
+  mac_myri0: 00:60:dd:48:5f:f6
+  ip_myri0: 10.69.8.13
 capricorne-1:
   mac_eth0: 00:0d:60:14:a2:7a
   ip_eth0: ""
@@ -75,6 +95,8 @@ capricorne-1:
   ip_eth1: 10.69.0.1
   ip_mgt: 10.69.136.1
   mac_mgt: 00:11:25:91:45:77
+  mac_myri0: 00:60:dd:48:60:46
+  ip_myri0: 10.69.8.13
 capricorne-20:
   mac_eth0: 00:0d:60:14:a3:20
   ip_eth0: ""
@@ -82,6 +104,8 @@ capricorne-20:
   ip_eth1: 10.69.0.20
   ip_mgt: 10.69.136.20
   mac_mgt: 00:11:25:91:45:31
+  mac_myri0: 00:60:dd:48:60:1b
+  ip_myri0: 10.69.8.13
 capricorne-21:
   mac_eth0: 00:0d:60:14:a3:42
   ip_eth0: ""
@@ -89,6 +113,8 @@ capricorne-21:
   ip_eth1: 10.69.0.21
   ip_mgt: 10.69.136.21
   mac_mgt: 00:11:25:91:44:5d
+  mac_myri0: 00:60:dd:48:5f:ea
+  ip_myri0: 10.69.8.13
 capricorne-22:
   mac_eth0: 00:0d:60:14:a3:44
   ip_eth0: ""
@@ -96,6 +122,8 @@ capricorne-22:
   ip_eth1: 10.69.0.22
   ip_mgt: 10.69.136.22
   mac_mgt: 00:11:25:91:45:07
+  mac_myri0: 00:60:dd:48:5f:a7
+  ip_myri0: 10.69.8.13
 capricorne-23:
   mac_eth0: 00:0d:60:14:a3:70
   ip_eth0: ""
@@ -103,6 +131,8 @@ capricorne-23:
   ip_eth1: 10.69.0.23
   ip_mgt: 10.69.136.23
   mac_mgt: 00:11:25:91:44:59
+  mac_myri0: 00:60:dd:48:5f:e1
+  ip_myri0: 10.69.8.13
 capricorne-24:
   mac_eth0: 00:0d:60:14:a0:d6
   ip_eth0: ""
@@ -110,6 +140,8 @@ capricorne-24:
   ip_eth1: 10.69.0.24
   ip_mgt: 10.69.136.24
   mac_mgt: 00:11:25:91:45:4c
+  mac_myri0: 00:60:dd:48:5f:b0
+  ip_myri0: 10.69.8.13
 capricorne-25:
   mac_eth0: 00:0d:60:14:a3:1a
   ip_eth0: ""
@@ -117,6 +149,8 @@ capricorne-25:
   ip_eth1: 10.69.0.25
   ip_mgt: 10.69.136.25
   mac_mgt: 00:11:25:91:44:f1
+  mac_myri0: 00:60:dd:48:5f:aa
+  ip_myri0: 10.69.8.13
 capricorne-26:
   mac_eth0: 00:0d:60:14:a3:08
   ip_eth0: ""
@@ -124,6 +158,8 @@ capricorne-26:
   ip_eth1: 10.69.0.26
   ip_mgt: 10.69.136.26
   mac_mgt: 00:11:25:91:44:64
+  mac_myri0: 00:60:dd:48:5f:af
+  ip_myri0: 10.69.8.13
 capricorne-27:
   mac_eth0: 00:0d:60:14:a3:28
   ip_eth0: ""
@@ -131,6 +167,8 @@ capricorne-27:
   ip_eth1: 10.69.0.27
   ip_mgt: 10.69.136.27
   mac_mgt: 00:09:6b:9e:74:3e
+  mac_myri0: 00:60:dd:48:5f:dd
+  ip_myri0: 10.69.8.13
 capricorne-28:
   mac_eth0: 00:0d:60:14:a1:68
   ip_eth0: ""
@@ -138,6 +176,8 @@ capricorne-28:
   ip_eth1: 10.69.0.28
   ip_mgt: 10.69.136.28
   mac_mgt: 00:09:6b:9e:67:fc
+  mac_myri0: 
+  ip_myri0: 10.69.8.13
 capricorne-29:
   mac_eth0: 00:0d:60:14:a3:26
   ip_eth0: ""
@@ -145,6 +185,8 @@ capricorne-29:
   ip_eth1: 10.69.0.29
   ip_mgt: 10.69.136.29
   mac_mgt: 00:11:25:91:44:74
+  mac_myri0: 00:60:dd:48:5f:a9
+  ip_myri0: 10.69.8.13
 capricorne-2:
   mac_eth0: 00:0d:60:14:a2:d6
   ip_eth0: ""
@@ -152,6 +194,8 @@ capricorne-2:
   ip_eth1: 10.69.0.2
   ip_mgt: 10.69.136.2
   mac_mgt: 00:11:25:91:44:6d
+  mac_myri0: 00:60:dd:48:60:3e
+  ip_myri0: 10.69.8.13
 capricorne-30:
   mac_eth0: 00:0d:60:14:a3:66
   ip_eth0: ""
@@ -159,6 +203,8 @@ capricorne-30:
   ip_eth1: 10.69.0.30
   ip_mgt: 10.69.136.30
   mac_mgt: 00:09:6b:9e:c4:08
+  mac_myri0: 00:60:dd:48:60:3c
+  ip_myri0: 10.69.8.13
 capricorne-32:
   mac_eth0: 00:0d:60:14:a2:fa
   ip_eth0: ""
@@ -166,6 +212,8 @@ capricorne-32:
   ip_eth1: 10.69.0.32
   ip_mgt: 10.69.136.32
   mac_mgt: 00:09:6b:9e:40:16
+  mac_myri0: 00:60:dd:48:60:3b
+  ip_myri0: 10.69.8.13
 capricorne-33:
   mac_eth0: 00:0d:60:14:a1:44
   ip_eth0: ""
@@ -173,6 +221,8 @@ capricorne-33:
   ip_eth1: 10.69.0.33
   ip_mgt: 10.69.136.33
   mac_mgt: 
+  mac_myri0:
+  ip_myri0: 10.69.8.13
 capricorne-34:
   mac_eth0: 00:0d:60:14:a0:e6
   ip_eth0: ""
@@ -180,6 +230,8 @@ capricorne-34:
   ip_eth1: 10.69.0.34
   ip_mgt: 10.69.136.34
   mac_mgt: 00:11:25:91:45:05
+  mac_myri0: 00:60:dd:48:43:3c
+  ip_myri0: 10.69.8.13
 capricorne-35:
   mac_eth0: 00:0d:60:14:a1:64
   ip_eth0: ""
@@ -187,6 +239,8 @@ capricorne-35:
   ip_eth1: 10.69.0.35
   ip_mgt: 10.69.136.35
   mac_mgt: 00:11:25:91:44:15
+  mac_myri0: 00:60:dd:48:43:67
+  ip_myri0: 10.69.8.13
 capricorne-36:
   mac_eth0: 00:0d:60:14:a1:2e
   ip_eth0: ""
@@ -194,6 +248,8 @@ capricorne-36:
   ip_eth1: 10.69.0.36
   ip_mgt: 10.69.136.36
   mac_mgt: 00:11:25:91:44:63
+  mac_myri0: 00:60:dd:48:43:2d
+  ip_myri0: 10.69.8.13
 capricorne-37:
   mac_eth0: 00:0d:60:14:a1:ee
   ip_eth0: ""
@@ -201,6 +257,8 @@ capricorne-37:
   ip_eth1: 10.69.0.37
   ip_mgt: 10.69.136.37
   mac_mgt: 00:11:25:91:44:53
+  mac_myri0: 00:60:dd:48:43:58
+  ip_myri0: 10.69.8.13
 capricorne-39:
   mac_eth0: 00:0d:60:14:a2:d0
   ip_eth0: ""
@@ -208,6 +266,8 @@ capricorne-39:
   ip_eth1: 10.69.0.39
   ip_mgt: 10.69.136.39
   mac_mgt: 00:11:25:91:44:89
+  mac_myri0: 00:60:dd:48:43:29
+  ip_myri0: 10.69.8.13
 capricorne-3:
   mac_eth0: 00:0d:60:14:a0:3e
   ip_eth0: ""
@@ -215,6 +275,8 @@ capricorne-3:
   ip_eth1: 10.69.0.3
   ip_mgt: 10.69.136.3
   mac_mgt: 00:11:25:91:44:60
+  mac_myri0: 00:60:dd:48:5f:de
+  ip_myri0: 10.69.8.13
 capricorne-40:
   mac_eth0: 00:0d:60:14:a0:2e
   ip_eth0: ""
@@ -222,6 +284,8 @@ capricorne-40:
   ip_eth1: 10.69.0.40
   ip_mgt: 10.69.136.40
   mac_mgt: 00:11:25:91:44:7b
+  mac_myri0: 00:60:dd:48:43:34
+  ip_myri0: 10.69.8.13
 capricorne-41:
   mac_eth0: 00:0d:60:14:a1:f0
   ip_eth0: ""
@@ -229,6 +293,8 @@ capricorne-41:
   ip_eth1: 10.69.0.41
   ip_mgt: 10.69.136.41
   mac_mgt: 00:11:25:91:44:68
+  mac_myri0: 00:60:dd:48:43:5b
+  ip_myri0: 10.69.8.13
 capricorne-42:
   mac_eth0: 00:0d:60:14:9f:9a
   ip_eth0: ""
@@ -236,6 +302,8 @@ capricorne-42:
   ip_eth1: 10.69.0.42
   ip_mgt: 10.69.136.42
   mac_mgt: 00:11:25:91:44:87
+  mac_myri0: 00:60:dd:48:43:4d
+  ip_myri0: 10.69.8.13
 capricorne-43:
   mac_eth0: 00:0d:60:14:a3:52
   ip_eth0: ""
@@ -243,6 +311,8 @@ capricorne-43:
   ip_eth1: 10.69.0.43
   ip_mgt: 10.69.136.43
   mac_mgt: 00:11:25:91:44:af
+  mac_myri0: 00:60:dd:48:43:59
+  ip_myri0: 10.69.8.13
 capricorne-44:
   mac_eth0: 00:0d:60:14:a3:3a
   ip_eth0: ""
@@ -250,6 +320,8 @@ capricorne-44:
   ip_eth1: 10.69.0.44
   ip_mgt: 10.69.136.44
   mac_mgt: 00:11:25:91:45:6c
+  mac_myri0: 00:60:dd:48:43:2e
+  ip_myri0: 10.69.8.13
 capricorne-45:
   mac_eth0: 00:0d:60:14:a1:4e
   ip_eth0: ""
@@ -257,6 +329,8 @@ capricorne-45:
   ip_eth1: 10.69.0.45
   ip_mgt: 10.69.136.45
   mac_mgt: 00:11:25:91:44:69
+  mac_myri0: 
+  ip_myri0: 10.69.8.13
 capricorne-46:
   mac_eth0: 00:0d:60:14:a0:ec
   ip_eth0: ""
@@ -264,6 +338,8 @@ capricorne-46:
   ip_eth1: 10.69.0.46
   ip_mgt: 10.69.136.46
   mac_mgt: 00:11:25:91:44:5f
+  mac_myri0: 00:60:dd:48:43:75
+  ip_myri0: 10.69.8.13
 capricorne-47:
   mac_eth0: 00:0d:60:14:9f:d4
   ip_eth0: ""
@@ -271,6 +347,8 @@ capricorne-47:
   ip_eth1: 10.69.0.47
   ip_mgt: 10.69.136.47
   mac_mgt: 00:11:25:91:45:67
+  mac_myri0:
+  ip_myri0: 10.69.8.13
 capricorne-48:
   mac_eth0: 00:0d:60:14:a2:02
   ip_eth0: 
@@ -278,6 +356,8 @@ capricorne-48:
   ip_eth1: 10.69.0.48
   ip_mgt: 10.69.136.48
   mac_mgt: 00:11:25:91:44:5e
+  mac_myri0:
+  ip_myri0: 10.69.8.13
 capricorne-49:
   mac_eth0: 00:0d:60:14:a0:32
   ip_eth0: ""
@@ -285,6 +365,8 @@ capricorne-49:
   ip_eth1: 10.69.0.49
   ip_mgt: 10.69.136.49
   mac_mgt: 00:11:25:91:45:61
+  mac_myri0: 00:60:dd:48:42:c6
+  ip_myri0: 10.69.8.13
 capricorne-4:
   mac_eth0: 00:11:25:1e:79:0c
   ip_eth0: ""
@@ -292,6 +374,8 @@ capricorne-4:
   ip_eth1: 10.69.0.4
   ip_mgt: 10.69.136.4
   mac_mgt: 00:11:25:91:45:51
+  mac_myri0: 00:60:dd:48:60:3d
+  ip_myri0: 10.69.8.13
 capricorne-5:
   mac_eth0: 00:0d:60:14:a3:64
   ip_eth0: ""
@@ -299,6 +383,8 @@ capricorne-5:
   ip_eth1: 10.69.0.5
   ip_mgt: 10.69.136.5
   mac_mgt: 
+  mac_myri0: 00:60:dd:48:60:44
+  ip_myri0: 10.69.8.13
 capricorne-50:
   mac_eth0: 00:0d:60:14:a3:36
   ip_eth0: ""
@@ -306,6 +392,8 @@ capricorne-50:
   ip_eth1: 10.69.0.50
   ip_mgt: 10.69.136.50
   mac_mgt: 
+  mac_myri0:
+  ip_myri0: 10.69.8.13
 capricorne-51:
   mac_eth0: 00:0d:60:14:a3:5e
   ip_eth0: ""
@@ -313,6 +401,8 @@ capricorne-51:
   ip_eth1: 10.69.0.51
   ip_mgt: 10.69.136.51
   mac_mgt: 
+  mac_myri0:
+  ip_myri0: 10.69.8.13
 capricorne-52:
   mac_eth0: 00:0d:60:14:a3:0a
   ip_eth0: ""
@@ -320,6 +410,8 @@ capricorne-52:
   ip_eth1: 10.69.0.52
   ip_mgt: 10.69.136.52
   mac_mgt: 00:11:25:91:66:16
+  mac_myri0: 00:60:dd:48:43:77
+  ip_myri0: 10.69.8.13
 capricorne-53:
   mac_eth0: 00:0d:60:14:a0:12
   ip_eth0: ""
@@ -327,6 +419,8 @@ capricorne-53:
   ip_eth1: 10.69.0.53
   ip_mgt: 10.69.136.53
   mac_mgt: 00:11:25:91:45:46
+  mac_myri0:
+  ip_myri0: 10.69.8.13
 capricorne-54:
   mac_eth0: 00:0d:60:14:a1:16
   ip_eth0: ""
@@ -334,6 +428,8 @@ capricorne-54:
   ip_eth1: 10.69.0.54
   ip_mgt: 10.69.136.54
   mac_mgt: 00:11:25:91:44:b0
+  mac_myri0: 00:60:dd:48:43:70
+  ip_myri0: 10.69.8.13
 capricorne-55:
   mac_eth0: 00:0d:60:14:a1:a8
   ip_eth0: ""
@@ -341,6 +437,8 @@ capricorne-55:
   ip_eth1: 10.69.0.55
   ip_mgt: 10.69.136.55
   mac_mgt: 00:11:25:91:45:60
+  mac_myri0:
+  ip_myri0: 10.69.8.13
 capricorne-56:
   mac_eth0: 00:0d:60:14:a2:e2
   ip_eth0: ""
@@ -348,6 +446,8 @@ capricorne-56:
   ip_eth1: 10.69.0.56
   ip_mgt: 10.69.136.56
   mac_mgt: 
+  mac_myri0: 00:60:dd:48:43:2a
+  ip_myri0: 10.69.8.13
 capricorne-6:
   mac_eth0: 00:0d:60:14:a1:58
   ip_eth0: ""
@@ -355,6 +455,8 @@ capricorne-6:
   ip_eth1: 10.69.0.6
   ip_mgt: 10.69.136.6
   mac_mgt: 00:11:25:91:44:1e
+  mac_myri0: 00:60:dd:48:60:38
+  ip_myri0: 10.69.8.13
 capricorne-8:
   mac_eth0: 00:0d:60:14:9f:8a
   ip_eth0: ""
@@ -362,6 +464,8 @@ capricorne-8:
   ip_eth1: 10.69.0.8
   ip_mgt: 10.69.136.8
   mac_mgt: 00:11:25:91:44:29
+  mac_myri0: 00:60:dd:48:5f:f4
+  ip_myri0: 10.69.8.13
 sagittaire-10:
   mac_eth0: 00:09:3d:11:aa:e1
   ip_eth0: 10.69.1.110
diff --git a/generators/input/nancy-graphene.yaml b/generators/input/nancy-graphene.yaml
index 24ee8290102da4b70e19addd29ba4ec7ce83541e..f557a52f892e000fd73635c2c862d145d853b37a 100644
--- a/generators/input/nancy-graphene.yaml
+++ b/generators/input/nancy-graphene.yaml
@@ -9,7 +9,7 @@ graphene-1:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:83
   ip_mgt: 172.17.64.1
-  ip_ib: 172.16.66.1
+  ip_ib: 172.18.64.1
   ip_eth0: 172.16.64.1
   disk_size: "625142448"
   disk_vend: ATA
@@ -32,7 +32,7 @@ graphene-2:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:73
   ip_mgt: 172.17.64.2
-  ip_ib: 172.16.66.2
+  ip_ib: 172.18.64.2
   ip_eth0: 172.16.64.2
   disk_size: "625142448"
   disk_vend: ATA
@@ -55,7 +55,7 @@ graphene-3:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:73
   ip_mgt: 172.17.64.3
-  ip_ib: 172.16.66.3
+  ip_ib: 172.18.64.3
   ip_eth0: 172.16.64.3
   disk_size: "625142448"
   disk_vend: ATA
@@ -69,16 +69,16 @@ graphene-3:
   guidib0: 20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:59
   guidib1: 20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:5a
 graphene-4:
-  serial: 1009390006
+  serial: 1009390096b
   switch_eth0: sgraphene1
   switch_pos_eth0: Gi1/0/3
   switch_ipmi: sgraphene1-ipmi
   switch_ipmi_pos: 1/0/28
   bios_ver: 7.02
   bios_release: 06/01/2011
-  mac_mgt: 00:e0:81:d5:06:fb
+  mac_mgt: 00:e0:81:d5:08:57
   ip_mgt: 172.17.64.4
-  ip_ib: 172.16.66.4
+  ip_ib: 172.18.64.4
   ip_eth0: 172.16.64.4
   disk_size: "625142448"
   disk_vend: ATA
@@ -86,11 +86,11 @@ graphene-4:
   disk_model: Hitachi HDS72103
   pdu: graphene-pdu1
   pdu_pos: 5
-  mac_eth0: 00:e0:81:d5:06:f8
-  mac_eth1: 00:e0:81:d5:06:f9
-  mac_eth2: 00:e0:81:d5:06:fa
-  guidib0: 20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4d
-  guidib1: 20:00:55:00:41:00:00:00:00:00:00:00:02:c9:03:00:0b:91:4e
+  mac_eth0: 00:e0:81:d5:08:54
+  mac_eth1: 00:e0:81:d5:08:55
+  mac_eth2: 00:e0:81:d5:08:56
+  guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:bd
+  guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:0b:92:be
 graphene-5:
   serial: 1009390007
   switch_eth0: sgraphene1
@@ -101,7 +101,7 @@ graphene-5:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:bb
   ip_mgt: 172.17.64.5
-  ip_ib: 172.16.66.5
+  ip_ib: 172.18.64.5
   ip_eth0: 172.16.64.5
   disk_size: "625142448"
   disk_vend: ATA
@@ -124,7 +124,7 @@ graphene-6:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:ef
   ip_mgt: 172.17.64.6
-  ip_ib: 172.16.66.6
+  ip_ib: 172.18.64.6
   ip_eth0: 172.16.64.6
   disk_size: "625142448"
   disk_vend: ATA
@@ -147,7 +147,7 @@ graphene-7:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:3f
   ip_mgt: 172.17.64.7
-  ip_ib: 172.16.66.7
+  ip_ib: 172.18.64.7
   ip_eth0: 172.16.64.7
   disk_size: "625142448"
   disk_vend: ATA
@@ -170,7 +170,7 @@ graphene-8:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:0b
   ip_mgt: 172.17.64.8
-  ip_ib: 172.16.66.8
+  ip_ib: 172.18.64.8
   ip_eth0: 172.16.64.8
   disk_size: "625142448"
   disk_vend: ATA
@@ -193,7 +193,7 @@ graphene-9:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:87
   ip_mgt: 172.17.64.9
-  ip_ib: 172.16.66.9
+  ip_ib: 172.18.64.9
   ip_eth0: 172.16.64.9
   disk_size: "625142448"
   disk_vend: ATA
@@ -216,7 +216,7 @@ graphene-10:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:d3
   ip_mgt: 172.17.64.10
-  ip_ib: 172.16.66.10
+  ip_ib: 172.18.64.10
   ip_eth0: 172.16.64.10
   disk_size: "625142448"
   disk_vend: ATA
@@ -239,7 +239,7 @@ graphene-11:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:7f
   ip_mgt: 172.17.64.11
-  ip_ib: 172.16.66.11
+  ip_ib: 172.18.64.11
   ip_eth0: 172.16.64.11
   disk_size: "625142448"
   disk_vend: ATA
@@ -262,7 +262,7 @@ graphene-12:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:8f
   ip_mgt: 172.17.64.12
-  ip_ib: 172.16.66.12
+  ip_ib: 172.18.64.12
   ip_eth0: 172.16.64.12
   disk_size: "625142448"
   disk_vend: ATA
@@ -285,7 +285,7 @@ graphene-13:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:ff
   ip_mgt: 172.17.64.13
-  ip_ib: 172.16.66.13
+  ip_ib: 172.18.64.13
   ip_eth0: 172.16.64.13
   disk_size: "625142448"
   disk_vend: ATA
@@ -308,7 +308,7 @@ graphene-14:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:d7
   ip_mgt: 172.17.64.14
-  ip_ib: 172.16.66.14
+  ip_ib: 172.18.64.14
   ip_eth0: 172.16.64.14
   disk_size: "625142448"
   disk_vend: ATA
@@ -331,7 +331,7 @@ graphene-15:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:eb
   ip_mgt: 172.17.64.15
-  ip_ib: 172.16.66.15
+  ip_ib: 172.18.64.15
   ip_eth0: 172.16.64.15
   disk_size: "625142448"
   disk_vend: ATA
@@ -354,7 +354,7 @@ graphene-16:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:c3
   ip_mgt: 172.17.64.16
-  ip_ib: 172.16.66.16
+  ip_ib: 172.18.64.16
   ip_eth0: 172.16.64.16
   disk_size: "625142448"
   disk_vend: ATA
@@ -377,7 +377,7 @@ graphene-17:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:ab
   ip_mgt: 172.17.64.17
-  ip_ib: 172.16.66.17
+  ip_ib: 172.18.64.17
   ip_eth0: 172.16.64.17
   disk_size: "625142448"
   disk_vend: ATA
@@ -400,7 +400,7 @@ graphene-18:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:3f
   ip_mgt: 172.17.64.18
-  ip_ib: 172.16.66.18
+  ip_ib: 172.18.64.18
   ip_eth0: 172.16.64.18
   disk_size: "625142448"
   disk_vend: ATA
@@ -423,7 +423,7 @@ graphene-19:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:b7
   ip_mgt: 172.17.64.19
-  ip_ib: 172.16.66.19
+  ip_ib: 172.18.64.19
   ip_eth0: 172.16.64.19
   disk_size: "625142448"
   disk_vend: ATA
@@ -446,7 +446,7 @@ graphene-20:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:6b
   ip_mgt: 172.17.64.20
-  ip_ib: 172.16.66.20
+  ip_ib: 172.18.64.20
   ip_eth0: 172.16.64.20
   disk_size: "625142448"
   disk_vend: ATA
@@ -469,7 +469,7 @@ graphene-21:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d2:59:fb
   ip_mgt: 172.17.64.21
-  ip_ib: 172.16.66.21
+  ip_ib: 172.18.64.21
   ip_eth0: 172.16.64.21
   disk_size: "625142448"
   disk_vend: ATA
@@ -492,7 +492,7 @@ graphene-22:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:db
   ip_mgt: 172.17.64.22
-  ip_ib: 172.16.66.22
+  ip_ib: 172.18.64.22
   ip_eth0: 172.16.64.22
   disk_size: "625142448"
   disk_vend: ATA
@@ -515,7 +515,7 @@ graphene-23:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:c7
   ip_mgt: 172.17.64.23
-  ip_ib: 172.16.66.23
+  ip_ib: 172.18.64.23
   ip_eth0: 172.16.64.23
   disk_size: "625142448"
   disk_vend: ATA
@@ -538,7 +538,7 @@ graphene-24:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:13
   ip_mgt: 172.17.64.24
-  ip_ib: 172.16.66.24
+  ip_ib: 172.18.64.24
   ip_eth0: 172.16.64.24
   disk_size: "625142448"
   disk_vend: ATA
@@ -561,7 +561,7 @@ graphene-25:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:53
   ip_mgt: 172.17.64.25
-  ip_ib: 172.16.66.25
+  ip_ib: 172.18.64.25
   ip_eth0: 172.16.64.25
   disk_size: "625142448"
   disk_vend: ATA
@@ -584,7 +584,7 @@ graphene-26:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:6f
   ip_mgt: 172.17.64.26
-  ip_ib: 172.16.66.26
+  ip_ib: 172.18.64.26
   ip_eth0: 172.16.64.26
   disk_size: "625142448"
   disk_vend: ATA
@@ -607,7 +607,7 @@ graphene-27:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:5f
   ip_mgt: 172.17.64.27
-  ip_ib: 172.16.66.27
+  ip_ib: 172.18.64.27
   ip_eth0: 172.16.64.27
   disk_size: "625142448"
   disk_vend: ATA
@@ -630,7 +630,7 @@ graphene-28:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:9b
   ip_mgt: 172.17.64.28
-  ip_ib: 172.16.66.28
+  ip_ib: 172.18.64.28
   ip_eth0: 172.16.64.28
   disk_size: "625142448"
   disk_vend: ATA
@@ -653,7 +653,7 @@ graphene-29:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:f3
   ip_mgt: 172.17.64.29
-  ip_ib: 172.16.66.29
+  ip_ib: 172.18.64.29
   ip_eth0: 172.16.64.29
   disk_size: "625142448"
   disk_vend: ATA
@@ -676,7 +676,7 @@ graphene-30:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:ef
   ip_mgt: 172.17.64.30
-  ip_ib: 172.16.66.30
+  ip_ib: 172.18.64.30
   ip_eth0: 172.16.64.30
   disk_size: "625142448"
   disk_vend: ATA
@@ -699,7 +699,7 @@ graphene-31:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:63
   ip_mgt: 172.17.64.31
-  ip_ib: 172.16.66.31
+  ip_ib: 172.18.64.31
   ip_eth0: 172.16.64.31
   disk_size: "625142448"
   disk_vend: ATA
@@ -722,7 +722,7 @@ graphene-32:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:cb
   ip_mgt: 172.17.64.32
-  ip_ib: 172.16.66.32
+  ip_ib: 172.18.64.32
   ip_eth0: 172.16.64.32
   disk_size: "625142448"
   disk_vend: ATA
@@ -745,7 +745,7 @@ graphene-33:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:6f
   ip_mgt: 172.17.64.33
-  ip_ib: 172.16.66.33
+  ip_ib: 172.18.64.33
   ip_eth0: 172.16.64.33
   disk_size: "625142448"
   disk_vend: ATA
@@ -768,7 +768,7 @@ graphene-34:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:9f
   ip_mgt: 172.17.64.34
-  ip_ib: 172.16.66.34
+  ip_ib: 172.18.64.34
   ip_eth0: 172.16.64.34
   disk_size: "625142448"
   disk_vend: ATA
@@ -791,7 +791,7 @@ graphene-35:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:1f
   ip_mgt: 172.17.64.35
-  ip_ib: 172.16.66.35
+  ip_ib: 172.18.64.35
   ip_eth0: 172.16.64.35
   disk_size: "625142448"
   disk_vend: ATA
@@ -814,7 +814,7 @@ graphene-36:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:4b
   ip_mgt: 172.17.64.36
-  ip_ib: 172.16.66.36
+  ip_ib: 172.18.64.36
   ip_eth0: 172.16.64.36
   disk_size: "625142448"
   disk_vend: ATA
@@ -837,7 +837,7 @@ graphene-37:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:a7
   ip_mgt: 172.17.64.37
-  ip_ib: 172.16.66.37
+  ip_ib: 172.18.64.37
   ip_eth0: 172.16.64.37
   disk_size: "625142448"
   disk_vend: ATA
@@ -860,7 +860,7 @@ graphene-38:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:33
   ip_mgt: 172.17.64.38
-  ip_ib: 172.16.66.38
+  ip_ib: 172.18.64.38
   ip_eth0: 172.16.64.38
   disk_size: "625142448"
   disk_vend: ATA
@@ -883,7 +883,7 @@ graphene-39:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:df
   ip_mgt: 172.17.64.39
-  ip_ib: 172.16.66.39
+  ip_ib: 172.18.64.39
   ip_eth0: 172.16.64.39
   disk_size: "625142448"
   disk_vend: ATA
@@ -906,7 +906,7 @@ graphene-40:
   bios_release: 06/01/2011
   mac_mgt: 00:10:20:3d:40:5f
   ip_mgt: 172.17.64.40
-  ip_ib: 172.16.66.40
+  ip_ib: 172.18.64.40
   ip_eth0: 172.16.64.40
   disk_size: "625142448"
   disk_vend: ATA
@@ -929,7 +929,7 @@ graphene-41:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:af
   ip_mgt: 172.17.64.41
-  ip_ib: 172.16.66.41
+  ip_ib: 172.18.64.41
   ip_eth0: 172.16.64.41
   disk_size: "625142448"
   disk_vend: ATA
@@ -952,7 +952,7 @@ graphene-42:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:8b
   ip_mgt: 172.17.64.42
-  ip_ib: 172.16.66.42
+  ip_ib: 172.18.64.42
   ip_eth0: 172.16.64.42
   disk_size: "625142448"
   disk_vend: ATA
@@ -975,7 +975,7 @@ graphene-43:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:27
   ip_mgt: 172.17.64.43
-  ip_ib: 172.16.66.43
+  ip_ib: 172.18.64.43
   ip_eth0: 172.16.64.43
   disk_size: "625142448"
   disk_vend: ATA
@@ -998,7 +998,7 @@ graphene-44:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:e3
   ip_mgt: 172.17.64.44
-  ip_ib: 172.16.66.44
+  ip_ib: 172.18.64.44
   ip_eth0: 172.16.64.44
   disk_size: "625142448"
   disk_vend: ATA
@@ -1021,7 +1021,7 @@ graphene-45:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:8b
   ip_mgt: 172.17.64.45
-  ip_ib: 172.16.66.45
+  ip_ib: 172.18.64.45
   ip_eth0: 172.16.64.45
   disk_size: "625142448"
   disk_vend: ATA
@@ -1044,7 +1044,7 @@ graphene-46:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:97
   ip_mgt: 172.17.64.46
-  ip_ib: 172.16.66.46
+  ip_ib: 172.18.64.46
   ip_eth0: 172.16.64.46
   disk_size: "625142448"
   disk_vend: ATA
@@ -1067,7 +1067,7 @@ graphene-47:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:97
   ip_mgt: 172.17.64.47
-  ip_ib: 172.16.66.47
+  ip_ib: 172.18.64.47
   ip_eth0: 172.16.64.47
   disk_size: "625142448"
   disk_vend: ATA
@@ -1090,7 +1090,7 @@ graphene-48:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:eb
   ip_mgt: 172.17.64.48
-  ip_ib: 172.16.66.48
+  ip_ib: 172.18.64.48
   ip_eth0: 172.16.64.48
   disk_size: "625142448"
   disk_vend: ATA
@@ -1113,7 +1113,7 @@ graphene-49:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:5f
   ip_mgt: 172.17.64.49
-  ip_ib: 172.16.66.49
+  ip_ib: 172.18.64.49
   ip_eth0: 172.16.64.49
   disk_size: "625142448"
   disk_vend: ATA
@@ -1136,7 +1136,7 @@ graphene-50:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:77
   ip_mgt: 172.17.64.50
-  ip_ib: 172.16.66.50
+  ip_ib: 172.18.64.50
   ip_eth0: 172.16.64.50
   disk_size: "625142448"
   disk_vend: ATA
@@ -1159,7 +1159,7 @@ graphene-51:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:63
   ip_mgt: 172.17.64.51
-  ip_ib: 172.16.66.51
+  ip_ib: 172.18.64.51
   ip_eth0: 172.16.64.51
   disk_size: "625142448"
   disk_vend: ATA
@@ -1182,7 +1182,7 @@ graphene-52:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:0f
   ip_mgt: 172.17.64.52
-  ip_ib: 172.16.66.52
+  ip_ib: 172.18.64.52
   ip_eth0: 172.16.64.52
   disk_size: "625142448"
   disk_vend: ATA
@@ -1205,7 +1205,7 @@ graphene-53:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:fb
   ip_mgt: 172.17.64.53
-  ip_ib: 172.16.66.53
+  ip_ib: 172.18.64.53
   ip_eth0: 172.16.64.53
   disk_size: "625142448"
   disk_vend: ATA
@@ -1228,7 +1228,7 @@ graphene-54:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:ab
   ip_mgt: 172.17.64.54
-  ip_ib: 172.16.66.54
+  ip_ib: 172.18.64.54
   ip_eth0: 172.16.64.54
   disk_size: "625142448"
   disk_vend: ATA
@@ -1251,7 +1251,7 @@ graphene-55:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:93
   ip_mgt: 172.17.64.55
-  ip_ib: 172.16.66.55
+  ip_ib: 172.18.64.55
   ip_eth0: 172.16.64.55
   disk_size: "625142448"
   disk_vend: ATA
@@ -1274,7 +1274,7 @@ graphene-56:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:7b
   ip_mgt: 172.17.64.56
-  ip_ib: 172.16.66.56
+  ip_ib: 172.18.64.56
   ip_eth0: 172.16.64.56
   disk_size: "625142448"
   disk_vend: ATA
@@ -1297,7 +1297,7 @@ graphene-57:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:a3
   ip_mgt: 172.17.64.57
-  ip_ib: 172.16.66.57
+  ip_ib: 172.18.64.57
   ip_eth0: 172.16.64.57
   disk_size: "625142448"
   disk_vend: ATA
@@ -1320,7 +1320,7 @@ graphene-58:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:37
   ip_mgt: 172.17.64.58
-  ip_ib: 172.16.66.58
+  ip_ib: 172.18.64.58
   ip_eth0: 172.16.64.58
   disk_size: "625142448"
   disk_vend: ATA
@@ -1343,7 +1343,7 @@ graphene-59:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:2f
   ip_mgt: 172.17.64.59
-  ip_ib: 172.16.66.59
+  ip_ib: 172.18.64.59
   ip_eth0: 172.16.64.59
   disk_size: "625142448"
   disk_vend: ATA
@@ -1366,7 +1366,7 @@ graphene-60:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:4f
   ip_mgt: 172.17.64.60
-  ip_ib: 172.16.66.60
+  ip_ib: 172.18.64.60
   ip_eth0: 172.16.64.60
   disk_size: "625142448"
   disk_vend: ATA
@@ -1389,7 +1389,7 @@ graphene-61:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:03
   ip_mgt: 172.17.64.61
-  ip_ib: 172.16.66.61
+  ip_ib: 172.18.64.61
   ip_eth0: 172.16.64.61
   disk_size: "625142448"
   disk_vend: ATA
@@ -1412,7 +1412,7 @@ graphene-62:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:c7
   ip_mgt: 172.17.64.62
-  ip_ib: 172.16.66.62
+  ip_ib: 172.18.64.62
   ip_eth0: 172.16.64.62
   disk_size: "625142448"
   disk_vend: ATA
@@ -1435,7 +1435,7 @@ graphene-63:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:6b
   ip_mgt: 172.17.64.63
-  ip_ib: 172.16.66.63
+  ip_ib: 172.18.64.63
   ip_eth0: 172.16.64.63
   disk_size: "625142448"
   disk_vend: ATA
@@ -1458,7 +1458,7 @@ graphene-64:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:8b
   ip_mgt: 172.17.64.64
-  ip_ib: 172.16.66.64
+  ip_ib: 172.18.64.64
   ip_eth0: 172.16.64.64
   disk_size: "625142448"
   disk_vend: ATA
@@ -1481,7 +1481,7 @@ graphene-65:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:47
   ip_mgt: 172.17.64.65
-  ip_ib: 172.16.66.65
+  ip_ib: 172.18.64.65
   ip_eth0: 172.16.64.65
   disk_size: "625142448"
   disk_vend: ATA
@@ -1504,7 +1504,7 @@ graphene-66:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:17
   ip_mgt: 172.17.64.66
-  ip_ib: 172.16.66.66
+  ip_ib: 172.18.64.66
   ip_eth0: 172.16.64.66
   disk_size: "625142448"
   disk_vend: ATA
@@ -1527,7 +1527,7 @@ graphene-67:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:b3
   ip_mgt: 172.17.64.67
-  ip_ib: 172.16.66.67
+  ip_ib: 172.18.64.67
   ip_eth0: 172.16.64.67
   disk_size: "625142448"
   disk_vend: ATA
@@ -1550,7 +1550,7 @@ graphene-68:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:53
   ip_mgt: 172.17.64.68
-  ip_ib: 172.16.66.68
+  ip_ib: 172.18.64.68
   ip_eth0: 172.16.64.68
   disk_size: "625142448"
   disk_vend: ATA
@@ -1573,7 +1573,7 @@ graphene-69:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:9b
   ip_mgt: 172.17.64.69
-  ip_ib: 172.16.66.69
+  ip_ib: 172.18.64.69
   ip_eth0: 172.16.64.69
   disk_size: "625142448"
   disk_vend: ATA
@@ -1596,7 +1596,7 @@ graphene-70:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:4f
   ip_mgt: 172.17.64.70
-  ip_ib: 172.16.66.70
+  ip_ib: 172.18.64.70
   ip_eth0: 172.16.64.70
   disk_size: "625142448"
   disk_vend: ATA
@@ -1619,7 +1619,7 @@ graphene-71:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:2b
   ip_mgt: 172.17.64.71
-  ip_ib: 172.16.66.71
+  ip_ib: 172.18.64.71
   ip_eth0: 172.16.64.71
   disk_size: "625142448"
   disk_vend: ATA
@@ -1642,7 +1642,7 @@ graphene-72:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:e7
   ip_mgt: 172.17.64.72
-  ip_ib: 172.16.66.72
+  ip_ib: 172.18.64.72
   ip_eth0: 172.16.64.72
   disk_size: "625142448"
   disk_vend: ATA
@@ -1665,7 +1665,7 @@ graphene-73:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:43
   ip_mgt: 172.17.64.73
-  ip_ib: 172.16.66.73
+  ip_ib: 172.18.64.73
   ip_eth0: 172.16.64.73
   disk_size: "625142448"
   disk_vend: ATA
@@ -1688,7 +1688,7 @@ graphene-74:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:83
   ip_mgt: 172.17.64.74
-  ip_ib: 172.16.66.74
+  ip_ib: 172.18.64.74
   ip_eth0: 172.16.64.74
   disk_size: "625142448"
   disk_vend: ATA
@@ -1711,7 +1711,7 @@ graphene-75:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:07
   ip_mgt: 172.17.64.75
-  ip_ib: 172.16.66.75
+  ip_ib: 172.18.64.75
   ip_eth0: 172.16.64.75
   disk_size: "625142448"
   disk_vend: ATA
@@ -1734,7 +1734,7 @@ graphene-76:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:23
   ip_mgt: 172.17.64.76
-  ip_ib: 172.16.66.76
+  ip_ib: 172.18.64.76
   ip_eth0: 172.16.64.76
   disk_size: "625142448"
   disk_vend: ATA
@@ -1757,7 +1757,7 @@ graphene-77:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:a3
   ip_mgt: 172.17.64.77
-  ip_ib: 172.16.66.77
+  ip_ib: 172.18.64.77
   ip_eth0: 172.16.64.77
   disk_size: "625142448"
   disk_vend: ATA
@@ -1780,7 +1780,7 @@ graphene-78:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:53
   ip_mgt: 172.17.64.78
-  ip_ib: 172.16.66.78
+  ip_ib: 172.18.64.78
   ip_eth0: 172.16.64.78
   disk_size: "625142448"
   disk_vend: ATA
@@ -1803,7 +1803,7 @@ graphene-79:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:7b
   ip_mgt: 172.17.64.79
-  ip_ib: 172.16.66.79
+  ip_ib: 172.18.64.79
   ip_eth0: 172.16.64.79
   disk_size: "625142448"
   disk_vend: ATA
@@ -1826,7 +1826,7 @@ graphene-80:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:db
   ip_mgt: 172.17.64.80
-  ip_ib: 172.16.66.80
+  ip_ib: 172.18.64.80
   ip_eth0: 172.16.64.80
   disk_size: "625142448"
   disk_vend: ATA
@@ -1849,7 +1849,7 @@ graphene-81:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:27
   ip_mgt: 172.17.64.81
-  ip_ib: 172.16.66.81
+  ip_ib: 172.18.64.81
   ip_eth0: 172.16.64.81
   disk_size: "625142448"
   disk_vend: ATA
@@ -1872,7 +1872,7 @@ graphene-82:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:b7
   ip_mgt: 172.17.64.82
-  ip_ib: 172.16.66.82
+  ip_ib: 172.18.64.82
   ip_eth0: 172.16.64.82
   disk_size: "625142448"
   disk_vend: ATA
@@ -1895,7 +1895,7 @@ graphene-83:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:93
   ip_mgt: 172.17.64.83
-  ip_ib: 172.16.66.83
+  ip_ib: 172.18.64.83
   ip_eth0: 172.16.64.83
   disk_size: "625142448"
   disk_vend: ATA
@@ -1918,7 +1918,7 @@ graphene-84:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:1b
   ip_mgt: 172.17.64.84
-  ip_ib: 172.16.66.84
+  ip_ib: 172.18.64.84
   ip_eth0: 172.16.64.84
   disk_size: "625142448"
   disk_vend: ATA
@@ -1941,7 +1941,7 @@ graphene-85:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:ef
   ip_mgt: 172.17.64.85
-  ip_ib: 172.16.66.85
+  ip_ib: 172.18.64.85
   ip_eth0: 172.16.64.85
   disk_size: "625142448"
   disk_vend: ATA
@@ -1964,7 +1964,7 @@ graphene-86:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:0f
   ip_mgt: 172.17.64.86
-  ip_ib: 172.16.66.86
+  ip_ib: 172.18.64.86
   ip_eth0: 172.16.64.86
   disk_size: "625142448"
   disk_vend: ATA
@@ -1987,7 +1987,7 @@ graphene-87:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:5b
   ip_mgt: 172.17.64.87
-  ip_ib: 172.16.66.87
+  ip_ib: 172.18.64.87
   ip_eth0: 172.16.64.87
   disk_size: "625142448"
   disk_vend: ATA
@@ -2010,7 +2010,7 @@ graphene-88:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:63
   ip_mgt: 172.17.64.88
-  ip_ib: 172.16.66.88
+  ip_ib: 172.18.64.88
   ip_eth0: 172.16.64.88
   disk_size: "625142448"
   disk_vend: ATA
@@ -2033,7 +2033,7 @@ graphene-89:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:9b
   ip_mgt: 172.17.64.89
-  ip_ib: 172.16.66.89
+  ip_ib: 172.18.64.89
   ip_eth0: 172.16.64.89
   disk_size: "625142448"
   disk_vend: ATA
@@ -2056,7 +2056,7 @@ graphene-90:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:67
   ip_mgt: 172.17.64.90
-  ip_ib: 172.16.66.90
+  ip_ib: 172.18.64.90
   ip_eth0: 172.16.64.90
   disk_size: "625142448"
   disk_vend: ATA
@@ -2079,7 +2079,7 @@ graphene-91:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:df
   ip_mgt: 172.17.64.91
-  ip_ib: 172.16.66.91
+  ip_ib: 172.18.64.91
   ip_eth0: 172.16.64.91
   disk_size: "625142448"
   disk_vend: ATA
@@ -2102,7 +2102,7 @@ graphene-92:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:a7
   ip_mgt: 172.17.64.92
-  ip_ib: 172.16.66.92
+  ip_ib: 172.18.64.92
   ip_eth0: 172.16.64.92
   disk_size: "625142448"
   disk_vend: ATA
@@ -2125,7 +2125,7 @@ graphene-93:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:4f
   ip_mgt: 172.17.64.93
-  ip_ib: 172.16.66.93
+  ip_ib: 172.18.64.93
   ip_eth0: 172.16.64.93
   disk_size: "625142448"
   disk_vend: ATA
@@ -2148,7 +2148,7 @@ graphene-94:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:93
   ip_mgt: 172.17.64.94
-  ip_ib: 172.16.66.94
+  ip_ib: 172.18.64.94
   ip_eth0: 172.16.64.94
   disk_size: "625142448"
   disk_vend: ATA
@@ -2171,7 +2171,7 @@ graphene-95:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:c3
   ip_mgt: 172.17.64.95
-  ip_ib: 172.16.66.95
+  ip_ib: 172.18.64.95
   ip_eth0: 172.16.64.95
   disk_size: "625142448"
   disk_vend: ATA
@@ -2194,7 +2194,7 @@ graphene-96:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:37
   ip_mgt: 172.17.64.96
-  ip_ib: 172.16.66.96
+  ip_ib: 172.18.64.96
   ip_eth0: 172.16.64.96
   disk_size: "625142448"
   disk_vend: ATA
@@ -2217,7 +2217,7 @@ graphene-97:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:03
   ip_mgt: 172.17.64.97
-  ip_ib: 172.16.66.97
+  ip_ib: 172.18.64.97
   ip_eth0: 172.16.64.97
   disk_size: "625142448"
   disk_vend: ATA
@@ -2240,7 +2240,7 @@ graphene-98:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:d7
   ip_mgt: 172.17.64.98
-  ip_ib: 172.16.66.98
+  ip_ib: 172.18.64.98
   ip_eth0: 172.16.64.98
   disk_size: "625142448"
   disk_vend: ATA
@@ -2263,7 +2263,7 @@ graphene-99:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:d7
   ip_mgt: 172.17.64.99
-  ip_ib: 172.16.66.99
+  ip_ib: 172.18.64.99
   ip_eth0: 172.16.64.99
   disk_size: "625142448"
   disk_vend: ATA
@@ -2286,7 +2286,7 @@ graphene-100:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:cf
   ip_mgt: 172.17.64.100
-  ip_ib: 172.16.66.100
+  ip_ib: 172.18.64.100
   ip_eth0: 172.16.64.100
   disk_size: "625142448"
   disk_vend: ATA
@@ -2309,7 +2309,7 @@ graphene-101:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:a3
   ip_mgt: 172.17.64.101
-  ip_ib: 172.16.66.101
+  ip_ib: 172.18.64.101
   ip_eth0: 172.16.64.101
   disk_size: "625142448"
   disk_vend: ATA
@@ -2332,7 +2332,7 @@ graphene-102:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:bf
   ip_mgt: 172.17.64.102
-  ip_ib: 172.16.66.102
+  ip_ib: 172.18.64.102
   ip_eth0: 172.16.64.102
   disk_size: "625142448"
   disk_vend: ATA
@@ -2355,7 +2355,7 @@ graphene-103:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:cb
   ip_mgt: 172.17.64.103
-  ip_ib: 172.16.66.103
+  ip_ib: 172.18.64.103
   ip_eth0: 172.16.64.103
   disk_size: "625142448"
   disk_vend: ATA
@@ -2378,7 +2378,7 @@ graphene-104:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:67
   ip_mgt: 172.17.64.104
-  ip_ib: 172.16.66.104
+  ip_ib: 172.18.64.104
   ip_eth0: 172.16.64.104
   disk_size: "625142448"
   disk_vend: ATA
@@ -2401,7 +2401,7 @@ graphene-105:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:bf
   ip_mgt: 172.17.64.105
-  ip_ib: 172.16.66.105
+  ip_ib: 172.18.64.105
   ip_eth0: 172.16.64.105
   disk_size: "625142448"
   disk_vend: ATA
@@ -2424,7 +2424,7 @@ graphene-106:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:f7
   ip_mgt: 172.17.64.106
-  ip_ib: 172.16.66.106
+  ip_ib: 172.18.64.106
   ip_eth0: 172.16.64.106
   disk_size: "625142448"
   disk_vend: ATA
@@ -2447,7 +2447,7 @@ graphene-107:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:cb
   ip_mgt: 172.17.64.107
-  ip_ib: 172.16.66.107
+  ip_ib: 172.18.64.107
   ip_eth0: 172.16.64.107
   disk_size: "625142448"
   disk_vend: ATA
@@ -2470,7 +2470,7 @@ graphene-108:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:17
   ip_mgt: 172.17.64.108
-  ip_ib: 172.16.66.108
+  ip_ib: 172.18.64.108
   ip_eth0: 172.16.64.108
   disk_size: "625142448"
   disk_vend: ATA
@@ -2493,7 +2493,7 @@ graphene-109:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:33
   ip_mgt: 172.17.64.109
-  ip_ib: 172.16.66.109
+  ip_ib: 172.18.64.109
   ip_eth0: 172.16.64.109
   disk_size: "625142448"
   disk_vend: ATA
@@ -2516,7 +2516,7 @@ graphene-110:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:6f
   ip_mgt: 172.17.64.110
-  ip_ib: 172.16.66.110
+  ip_ib: 172.18.64.110
   ip_eth0: 172.16.64.110
   disk_size: "625142448"
   disk_vend: ATA
@@ -2539,7 +2539,7 @@ graphene-111:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:5b
   ip_mgt: 172.17.64.111
-  ip_ib: 172.16.66.111
+  ip_ib: 172.18.64.111
   ip_eth0: 172.16.64.111
   disk_size: "625142448"
   disk_vend: ATA
@@ -2562,7 +2562,7 @@ graphene-112:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:13
   ip_mgt: 172.17.64.112
-  ip_ib: 172.16.66.112
+  ip_ib: 172.18.64.112
   ip_eth0: 172.16.64.112
   disk_size: "625142448"
   disk_vend: ATA
@@ -2585,7 +2585,7 @@ graphene-113:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:bf
   ip_mgt: 172.17.64.113
-  ip_ib: 172.16.66.113
+  ip_ib: 172.18.64.113
   ip_eth0: 172.16.64.113
   disk_size: "625142448"
   disk_vend: ATA
@@ -2608,7 +2608,7 @@ graphene-114:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:b3
   ip_mgt: 172.17.64.114
-  ip_ib: 172.16.66.114
+  ip_ib: 172.18.64.114
   ip_eth0: 172.16.64.114
   disk_size: "625142448"
   disk_vend: ATA
@@ -2631,7 +2631,7 @@ graphene-115:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:07
   ip_mgt: 172.17.64.115
-  ip_ib: 172.16.66.115
+  ip_ib: 172.18.64.115
   ip_eth0: 172.16.64.115
   disk_size: "625142448"
   disk_vend: ATA
@@ -2654,7 +2654,7 @@ graphene-116:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:2b
   ip_mgt: 172.17.64.116
-  ip_ib: 172.16.66.116
+  ip_ib: 172.18.64.116
   ip_eth0: 172.16.64.116
   disk_size: "625142448"
   disk_vend: ATA
@@ -2677,7 +2677,7 @@ graphene-117:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:e7
   ip_mgt: 172.17.64.117
-  ip_ib: 172.16.66.117
+  ip_ib: 172.18.64.117
   ip_eth0: 172.16.64.117
   disk_size: "625142448"
   disk_vend: ATA
@@ -2700,7 +2700,7 @@ graphene-118:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:bb
   ip_mgt: 172.17.64.118
-  ip_ib: 172.16.66.118
+  ip_ib: 172.18.64.118
   ip_eth0: 172.16.64.118
   disk_size: "625142448"
   disk_vend: ATA
@@ -2723,7 +2723,7 @@ graphene-119:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:f3
   ip_mgt: 172.17.64.119
-  ip_ib: 172.16.66.119
+  ip_ib: 172.18.64.119
   ip_eth0: 172.16.64.119
   disk_size: "625142448"
   disk_vend: ATA
@@ -2746,7 +2746,7 @@ graphene-120:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:af
   ip_mgt: 172.17.64.120
-  ip_ib: 172.16.66.120
+  ip_ib: 172.18.64.120
   ip_eth0: 172.16.64.120
   disk_size: "625142448"
   disk_vend: ATA
@@ -2769,7 +2769,7 @@ graphene-121:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:3b
   ip_mgt: 172.17.64.121
-  ip_ib: 172.16.66.121
+  ip_ib: 172.18.64.121
   ip_eth0: 172.16.64.121
   disk_size: "625142448"
   disk_vend: ATA
@@ -2792,7 +2792,7 @@ graphene-122:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:3b
   ip_mgt: 172.17.64.122
-  ip_ib: 172.16.66.122
+  ip_ib: 172.18.64.122
   ip_eth0: 172.16.64.122
   disk_size: "625142448"
   disk_vend: ATA
@@ -2815,7 +2815,7 @@ graphene-123:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:af
   ip_mgt: 172.17.64.123
-  ip_ib: 172.16.66.123
+  ip_ib: 172.18.64.123
   ip_eth0: 172.16.64.123
   disk_size: "625142448"
   disk_vend: ATA
@@ -2838,7 +2838,7 @@ graphene-124:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:a7
   ip_mgt: 172.17.64.124
-  ip_ib: 172.16.66.124
+  ip_ib: 172.18.64.124
   ip_eth0: 172.16.64.124
   disk_size: "625142448"
   disk_vend: ATA
@@ -2861,7 +2861,7 @@ graphene-125:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:6b
   ip_mgt: 172.17.64.125
-  ip_ib: 172.16.66.125
+  ip_ib: 172.18.64.125
   ip_eth0: 172.16.64.125
   disk_size: "625142448"
   disk_vend: ATA
@@ -2884,7 +2884,7 @@ graphene-126:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:d3
   ip_mgt: 172.17.64.126
-  ip_ib: 172.16.66.126
+  ip_ib: 172.18.64.126
   ip_eth0: 172.16.64.126
   disk_size: "625142448"
   disk_vend: ATA
@@ -2907,7 +2907,7 @@ graphene-127:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:43
   ip_mgt: 172.17.64.127
-  ip_ib: 172.16.66.127
+  ip_ib: 172.18.64.127
   ip_eth0: 172.16.64.127
   disk_size: "625142448"
   disk_vend: ATA
@@ -2930,7 +2930,7 @@ graphene-128:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:e7
   ip_mgt: 172.17.64.128
-  ip_ib: 172.16.66.128
+  ip_ib: 172.18.64.128
   ip_eth0: 172.16.64.128
   disk_size: "625142448"
   disk_vend: ATA
@@ -2953,7 +2953,7 @@ graphene-129:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:1f
   ip_mgt: 172.17.64.129
-  ip_ib: 172.16.66.129
+  ip_ib: 172.18.64.129
   ip_eth0: 172.16.64.129
   disk_size: "625142448"
   disk_vend: ATA
@@ -2976,7 +2976,7 @@ graphene-130:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d2:5a:37
   ip_mgt: 172.17.64.130
-  ip_ib: 172.16.66.130
+  ip_ib: 172.18.64.130
   ip_eth0: 172.16.64.130
   disk_size: "625142448"
   disk_vend: ATA
@@ -2999,7 +2999,7 @@ graphene-131:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:5f
   ip_mgt: 172.17.64.131
-  ip_ib: 172.16.66.131
+  ip_ib: 172.18.64.131
   ip_eth0: 172.16.64.131
   disk_size: "625142448"
   disk_vend: ATA
@@ -3022,7 +3022,7 @@ graphene-132:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:8f
   ip_mgt: 172.17.64.132
-  ip_ib: 172.16.66.132
+  ip_ib: 172.18.64.132
   ip_eth0: 172.16.64.132
   disk_size: "625142448"
   disk_vend: ATA
@@ -3045,7 +3045,7 @@ graphene-133:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:e3
   ip_mgt: 172.17.64.133
-  ip_ib: 172.16.66.133
+  ip_ib: 172.18.64.133
   ip_eth0: 172.16.64.133
   disk_size: "625142448"
   disk_vend: ATA
@@ -3068,7 +3068,7 @@ graphene-134:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:eb
   ip_mgt: 172.17.64.134
-  ip_ib: 172.16.66.134
+  ip_ib: 172.18.64.134
   ip_eth0: 172.16.64.134
   disk_size: "625142448"
   disk_vend: ATA
@@ -3091,7 +3091,7 @@ graphene-135:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:73
   ip_mgt: 172.17.64.135
-  ip_ib: 172.16.66.135
+  ip_ib: 172.18.64.135
   ip_eth0: 172.16.64.135
   disk_size: "625142448"
   disk_vend: ATA
@@ -3114,7 +3114,7 @@ graphene-136:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:7f
   ip_mgt: 172.17.64.136
-  ip_ib: 172.16.66.136
+  ip_ib: 172.18.64.136
   ip_eth0: 172.16.64.136
   disk_size: "625142448"
   disk_vend: ATA
@@ -3137,7 +3137,7 @@ graphene-137:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:47
   ip_mgt: 172.17.64.137
-  ip_ib: 172.16.66.137
+  ip_ib: 172.18.64.137
   ip_eth0: 172.16.64.137
   disk_size: "625142448"
   disk_vend: ATA
@@ -3160,7 +3160,7 @@ graphene-138:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:c7
   ip_mgt: 172.17.64.138
-  ip_ib: 172.16.66.138
+  ip_ib: 172.18.64.138
   ip_eth0: 172.16.64.138
   disk_size: "625142448"
   disk_vend: ATA
@@ -3183,7 +3183,7 @@ graphene-139:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:83
   ip_mgt: 172.17.64.139
-  ip_ib: 172.16.66.139
+  ip_ib: 172.18.64.139
   ip_eth0: 172.16.64.139
   disk_size: "625142448"
   disk_vend: ATA
@@ -3206,7 +3206,7 @@ graphene-140:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:7b
   ip_mgt: 172.17.64.140
-  ip_ib: 172.16.66.140
+  ip_ib: 172.18.64.140
   ip_eth0: 172.16.64.140
   disk_size: "625142448"
   disk_vend: ATA
@@ -3229,7 +3229,7 @@ graphene-141:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:08:77
   ip_mgt: 172.17.64.141
-  ip_ib: 172.16.66.141
+  ip_ib: 172.18.64.141
   ip_eth0: 172.16.64.141
   disk_size: "625142448"
   disk_vend: ATA
@@ -3252,7 +3252,7 @@ graphene-142:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:8f
   ip_mgt: 172.17.64.142
-  ip_ib: 172.16.66.142
+  ip_ib: 172.18.64.142
   ip_eth0: 172.16.64.142
   disk_size: "625142448"
   disk_vend: ATA
@@ -3275,7 +3275,7 @@ graphene-143:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:07:97
   ip_mgt: 172.17.64.143
-  ip_ib: 172.16.66.143
+  ip_ib: 172.18.64.143
   ip_eth0: 172.16.64.143
   disk_size: "625142448"
   disk_vend: ATA
@@ -3298,7 +3298,7 @@ graphene-144:
   bios_release: 06/01/2011
   mac_mgt: 00:e0:81:d5:06:bb
   ip_mgt: 172.17.64.144
-  ip_ib: 172.16.66.144
+  ip_ib: 172.18.64.144
   ip_eth0: 172.16.64.144
   disk_size: "625142448"
   disk_vend: ATA
diff --git a/generators/input/nancy-griffon.yaml b/generators/input/nancy-griffon.yaml
index 5942e6bab87fe70ff9760cfe93baa5ace9b9ec3c..63bcf827de519e505829d7dfdc99e58800b479d8 100644
--- a/generators/input/nancy-griffon.yaml
+++ b/generators/input/nancy-griffon.yaml
@@ -17,7 +17,7 @@ griffon-1:
   ip_eth1: ""
   ip_eth0: 172.16.65.1
   switch_ipmi_pos: "1/0/1"
-  ip_ib: 172.16.67.1
+  ip_ib: 172.18.65.1
   mac_ipmi: 00:E0:81:4F:E3:13
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -45,7 +45,7 @@ griffon-2:
   ip_eth0: 172.16.65.2
   ip_eth1: ""
   switch_ipmi_pos: "1/0/2"
-  ip_ib: 172.16.67.2
+  ip_ib: 172.18.65.2
   mac_ipmi: 00:E0:81:4F:E2:FC
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -73,7 +73,7 @@ griffon-3:
   ip_eth0: 172.16.65.3
   ip_eth1: ""
   switch_ipmi_pos: "1/0/3"
-  ip_ib: 172.16.67.3
+  ip_ib: 172.18.65.3
   mac_ipmi: 00:E0:81:4F:CB:0A
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -101,7 +101,7 @@ griffon-4:
   ip_eth0: 172.16.65.4
   ip_eth1: ""
   switch_ipmi_pos: "1/0/4"
-  ip_ib: 172.16.67.4
+  ip_ib: 172.18.65.4
   mac_ipmi: 00:E0:81:4F:E3:7A
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -129,7 +129,7 @@ griffon-5:
   ip_eth0: 172.16.65.5
   ip_eth1: ""
   switch_ipmi_pos: "1/0/5"
-  ip_ib: 172.16.67.5
+  ip_ib: 172.18.65.5
   mac_ipmi: 00:E0:81:4F:E3:8D
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -157,7 +157,7 @@ griffon-6:
   ip_eth0: 172.16.65.6
   ip_eth1: ""
   switch_ipmi_pos: "1/0/6"
-  ip_ib: 172.16.67.6
+  ip_ib: 172.18.65.6
   mac_ipmi: 00:E0:81:4F:E3:74
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -185,7 +185,7 @@ griffon-7:
   ip_eth0: 172.16.65.7
   ip_eth1: ""
   switch_ipmi_pos: "1/0/7"
-  ip_ib: 172.16.67.7
+  ip_ib: 172.18.65.7
   mac_ipmi: 00:E0:81:4F:CA:90
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -213,7 +213,7 @@ griffon-8:
   ip_eth0: 172.16.65.8
   ip_eth1: ""
   switch_ipmi_pos: "1/0/8"
-  ip_ib: 172.16.67.8
+  ip_ib: 172.18.65.8
   mac_ipmi: 00:E0:81:4F:E3:C2
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -241,7 +241,7 @@ griffon-9:
   ip_eth0: 172.16.65.9
   ip_eth1: ""
   switch_ipmi_pos: "1/0/9"
-  ip_ib: 172.16.67.9
+  ip_ib: 172.18.65.9
   mac_ipmi: 00:E0:81:4F:E2:FE
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -269,7 +269,7 @@ griffon-10:
   ip_eth0: 172.16.65.10
   ip_eth1: ""
   switch_ipmi_pos: "1/0/10"
-  ip_ib: 172.16.67.10
+  ip_ib: 172.18.65.10
   mac_ipmi: 00:E0:81:4F:CA:9E
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -297,7 +297,7 @@ griffon-11:
   ip_eth0: 172.16.65.11
   ip_eth1: ""
   switch_ipmi_pos: "1/0/25"
-  ip_ib: 172.16.67.11
+  ip_ib: 172.18.65.11
   mac_ipmi: 00:E0:81:4F:E3:70
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -326,7 +326,7 @@ griffon-12:
   ip_eth0: 172.16.65.12
   ip_eth1: ""
   switch_ipmi_pos: "1/0/26"
-  ip_ib: 172.16.67.12
+  ip_ib: 172.18.65.12
   mac_ipmi: 00:E0:81:4F:CA:8B
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -355,7 +355,7 @@ griffon-13:
   ip_eth0: 172.16.65.13
   ip_eth1: ""
   switch_ipmi_pos: "1/0/27"
-  ip_ib: 172.16.67.13
+  ip_ib: 172.18.65.13
   mac_ipmi: 00:E0:81:4F:E2:D4
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -384,7 +384,7 @@ griffon-14:
   ip_eth0: 172.16.65.14
   ip_eth1: ""
   switch_ipmi_pos: "1/0/28"
-  ip_ib: 172.16.67.14
+  ip_ib: 172.18.65.14
   mac_ipmi: 00:E0:81:4F:E2:C5
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -413,7 +413,7 @@ griffon-15:
   ip_eth0: 172.16.65.15
   ip_eth1: ""
   switch_ipmi_pos: "1/0/29"
-  ip_ib: 172.16.67.15
+  ip_ib: 172.18.65.15
   mac_ipmi: 00:E0:81:4F:E3:87
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -441,7 +441,7 @@ griffon-16:
   ip_eth0: 172.16.65.16
   ip_eth1: ""
   switch_ipmi_pos: "1/0/30"
-  ip_ib: 172.16.67.16
+  ip_ib: 172.18.65.16
   mac_ipmi: 00:E0:81:4F:E2:D8
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -469,7 +469,7 @@ griffon-17:
   ip_eth0: 172.16.65.17
   ip_eth1: ""
   switch_ipmi_pos: "1/0/31"
-  ip_ib: 172.16.67.17
+  ip_ib: 172.18.65.17
   mac_ipmi: 00:E0:81:4F:E3:6A
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -497,7 +497,7 @@ griffon-18:
   ip_eth0: 172.16.65.18
   ip_eth1: ""
   switch_ipmi_pos: "1/0/32"
-  ip_ib: 172.16.67.18
+  ip_ib: 172.18.65.18
   mac_ipmi: 00:E0:81:4F:CB:0E
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -525,7 +525,7 @@ griffon-19:
   ip_eth0: 172.16.65.19
   ip_eth1: ""
   switch_ipmi_pos: "1/0/33"
-  ip_ib: 172.16.67.19
+  ip_ib: 172.18.65.19
   mac_ipmi: 00:E0:81:4F:E3:00
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -553,7 +553,7 @@ griffon-20:
   ip_eth0: 172.16.65.20
   ip_eth1: ""
   switch_ipmi_pos: "1/0/34"
-  ip_ib: 172.16.67.20
+  ip_ib: 172.18.65.20
   mac_ipmi: 00:E0:81:4F:CA:8E
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -581,7 +581,7 @@ griffon-21:
   ip_eth0: 172.16.65.21
   ip_eth1: ""
   switch_ipmi_pos: "1/0/35"
-  ip_ib: 172.16.67.21
+  ip_ib: 172.18.65.21
   mac_ipmi: 00:E0:81:4F:E2:FB
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -609,7 +609,7 @@ griffon-22:
   ip_eth0: 172.16.65.22
   ip_eth1: ""
   switch_ipmi_pos: "1/0/36"
-  ip_ib: 172.16.67.22
+  ip_ib: 172.18.65.22
   mac_ipmi: 00:E0:81:4F:CB:02
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -637,7 +637,7 @@ griffon-23:
   ip_eth0: 172.16.65.23
   ip_eth1: ""
   switch_ipmi_pos: "1/O/37"
-  ip_ib: 172.16.67.23
+  ip_ib: 172.18.65.23
   mac_ipmi: 00:E0:81:4F:CA:7E
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -665,7 +665,7 @@ griffon-24:
   ip_eth0: 172.16.65.24
   ip_eth1: ""
   switch_ipmi_pos: "1/0/38"
-  ip_ib: 172.16.67.24
+  ip_ib: 172.18.65.24
   mac_ipmi: 00:E0:81:4F:CA:7F
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -693,7 +693,7 @@ griffon-25:
   ip_eth0: 172.16.65.25
   ip_eth1: ""
   switch_ipmi_pos: "1/0/39"
-  ip_ib: 172.16.67.25
+  ip_ib: 172.18.65.25
   mac_ipmi: 00:E0:81:4F:E3:BA
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -721,7 +721,7 @@ griffon-26:
   ip_eth0: 172.16.65.26
   ip_eth1: ""
   switch_ipmi_pos: "1/0/40"
-  ip_ib: 172.16.67.26
+  ip_ib: 172.18.65.26
   mac_ipmi: 00:E0:81:4F:B5:DA
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -749,7 +749,7 @@ griffon-27:
   ip_eth0: 172.16.65.27
   ip_eth1: ""
   switch_ipmi_pos: "1/0/41"
-  ip_ib: 172.16.67.27
+  ip_ib: 172.18.65.27
   mac_ipmi: 00:E0:81:4F:E2:CB
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -777,7 +777,7 @@ griffon-28:
   ip_eth0: 172.16.65.28
   ip_eth1: ""
   switch_ipmi_pos: "1/0/42"
-  ip_ib: 172.16.67.28
+  ip_ib: 172.18.65.28
   mac_ipmi: 00:E0:81:4F:CA:8D
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -789,7 +789,7 @@ griffon-28:
   disk_vend: ATA
 griffon-29:
   serial: "812530034"
-  mac_eth0: 00:E0:81:B2:C4:BO
+  mac_eth0: 00:E0:81:B2:C4:B0
   mac_ib: C90300033042
   mac_eth1: 00:E0:81:B2:C4:B1
   pdu: griffon-pdu2
@@ -805,7 +805,7 @@ griffon-29:
   ip_eth0: 172.16.65.29
   ip_eth1: ""
   switch_ipmi_pos: "1/0/43"
-  ip_ib: 172.16.67.29
+  ip_ib: 172.18.65.29
   mac_ipmi: 00:E0:81:4F:E3:71
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -833,7 +833,7 @@ griffon-30:
   ip_eth0: 172.16.65.30
   ip_eth1: ""
   switch_ipmi_pos: "1/0/1"
-  ip_ib: 172.16.67.30
+  ip_ib: 172.18.65.30
   mac_ipmi: 00:E0:81:4F:E3:10
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -861,7 +861,7 @@ griffon-31:
   ip_eth0: 172.16.65.31
   ip_eth1: ""
   switch_ipmi_pos: "1/0/2"
-  ip_ib: 172.16.67.31
+  ip_ib: 172.18.65.31
   mac_ipmi: 00:E0:81:4F:CB:03
   bios_ver: V1.04B
   bios_release: 12/02/2008
@@ -889,7 +889,7 @@ griffon-32:
   ip_eth0: 172.16.65.32
   ip_eth1: ""
   switch_ipmi_pos: "1/0/3"
-  ip_ib: 172.16.67.32
+  ip_ib: 172.18.65.32
   mac_ipmi: 00:E0:81:4F:E3:8B
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -917,7 +917,7 @@ griffon-33:
   ip_eth0: 172.16.65.33
   ip_eth1: ""
   switch_ipmi_pos: "1/0/4"
-  ip_ib: 172.16.67.33
+  ip_ib: 172.18.65.33
   mac_ipmi: 00:E0:81:4F:CA:7A
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -945,7 +945,7 @@ griffon-34:
   ip_eth0: 172.16.65.34
   ip_eth1: ""
   switch_ipmi_pos: "1/0/5"
-  ip_ib: 172.16.67.34
+  ip_ib: 172.18.65.34
   mac_ipmi: 00:E0:81:4F:CB:20
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -973,7 +973,7 @@ griffon-35:
   ip_eth0: 172.16.65.35
   ip_eth1: ""
   switch_ipmi_pos: "1/0/6"
-  ip_ib: 172.16.67.35
+  ip_ib: 172.18.65.35
   mac_ipmi: 00:E0:81:4F:B5:EA
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1001,7 +1001,7 @@ griffon-36:
   ip_eth0: 172.16.65.36
   ip_eth1: ""
   switch_ipmi_pos: "7"
-  ip_ib: 172.16.67.36
+  ip_ib: 172.18.65.36
   mac_ipmi: 00:E0:81:4F:B5:E8
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1029,7 +1029,7 @@ griffon-37:
   ip_eth0: 172.16.65.37
   ip_eth1: ""
   switch_ipmi_pos: "1/0/8"
-  ip_ib: 172.16.67.37
+  ip_ib: 172.18.65.37
   mac_ipmi: 00:E0:81:4F:E2:D7
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1057,7 +1057,7 @@ griffon-38:
   ip_eth0: 172.16.65.38
   ip_eth1: ""
   switch_ipmi_pos: "1/0/9"
-  ip_ib: 172.16.67.38
+  ip_ib: 172.18.65.38
   mac_ipmi: 00:E0:81:4F:E3:68
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1085,7 +1085,7 @@ griffon-39:
   ip_eth0: 172.16.65.39
   ip_eth1: ""
   switch_ipmi_pos: "1/0/25"
-  ip_ib: 172.16.67.39
+  ip_ib: 172.18.65.39
   mac_ipmi: 00:E0:81:4F:E2:BF
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1113,7 +1113,7 @@ griffon-40:
   ip_eth0: 172.16.65.40
   ip_eth1: ""
   switch_ipmi_pos: "1/0/26"
-  ip_ib: 172.16.67.40
+  ip_ib: 172.18.65.40
   mac_ipmi: 00:E0:81:4F:E2:C6
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1141,7 +1141,7 @@ griffon-41:
   ip_eth0: 172.16.65.41
   ip_eth1: ""
   switch_ipmi_pos: "1/0/27"
-  ip_ib: 172.16.67.41
+  ip_ib: 172.18.65.41
   mac_ipmi: 00:E0:81:4F:B5:E1
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1169,7 +1169,7 @@ griffon-42:
   ip_eth0: 172.16.65.42
   ip_eth1: ""
   switch_ipmi_pos: "1/0/28"
-  ip_ib: 172.16.67.42
+  ip_ib: 172.18.65.42
   mac_ipmi: 00:E0:81:4F:E3:65
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1197,7 +1197,7 @@ griffon-43:
   ip_eth0: 172.16.65.43
   ip_eth1: ""
   switch_ipmi_pos: "1/0/29"
-  ip_ib: 172.16.67.43
+  ip_ib: 172.18.65.43
   mac_ipmi: 00:E0:81:4F:B5:E4
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1225,7 +1225,7 @@ griffon-44:
   ip_eth0: 172.16.65.44
   ip_eth1: ""
   switch_ipmi_pos: "1/0/30"
-  ip_ib: 172.16.67.44
+  ip_ib: 172.18.65.44
   mac_ipmi: 00:E0:81:4F:E2:B7
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1253,7 +1253,7 @@ griffon-45:
   ip_eth0: 172.16.65.45
   ip_eth1: ""
   switch_ipmi_pos: "1/0/31"
-  ip_ib: 172.16.67.45
+  ip_ib: 172.18.65.45
   mac_ipmi: 00:E0:81:4F:E2:C4
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1281,7 +1281,7 @@ griffon-46:
   ip_eth0: 172.16.65.46
   ip_eth1: ""
   switch_ipmi_pos: "1/0/32"
-  ip_ib: 172.16.67.46
+  ip_ib: 172.18.65.46
   mac_ipmi: 00:E0:81:4F:CA:79
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1309,7 +1309,7 @@ griffon-47:
   ip_eth0: 172.16.65.47
   ip_eth1: ""
   switch_ipmi_pos: "1/0/33"
-  ip_ib: 172.16.67.47
+  ip_ib: 172.18.65.47
   mac_ipmi: 00:E0:81:4F:E3:0A
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1337,7 +1337,7 @@ griffon-48:
   ip_eth0: 172.16.65.48
   ip_eth1: ""
   switch_ipmi_pos: "1/0/34"
-  ip_ib: 172.16.67.48
+  ip_ib: 172.18.65.48
   mac_ipmi: 00:E0:81:4F:CA:80
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1365,7 +1365,7 @@ griffon-49:
   ip_eth0: 172.16.65.49
   ip_eth1: ""
   switch_ipmi_pos: "1/0/35"
-  ip_ib: 172.16.67.49
+  ip_ib: 172.18.65.49
   mac_ipmi: 00:E0:81:4F:E2:C9
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1393,7 +1393,7 @@ griffon-50:
   ip_eth0: 172.16.65.50
   ip_eth1: ""
   switch_ipmi_pos: "1/0/36"
-  ip_ib: 172.16.67.50
+  ip_ib: 172.18.65.50
   mac_ipmi: 00:E0:81:4F:E2:FA
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1421,7 +1421,7 @@ griffon-51:
   ip_eth0: 172.16.65.51
   ip_eth1: ""
   switch_ipmi_pos: "1/0/37"
-  ip_ib: 172.16.67.51
+  ip_ib: 172.18.65.51
   mac_ipmi: 00:E0:81:4F:E3:92
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1449,7 +1449,7 @@ griffon-52:
   ip_eth0: 172.16.65.52
   ip_eth1: ""
   switch_ipmi_pos: "1/0/38"
-  ip_ib: 172.16.67.52
+  ip_ib: 172.18.65.52
   mac_ipmi: 00:E0:81:4F:E3:7E
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1477,7 +1477,7 @@ griffon-53:
   ip_eth0: 172.16.65.53
   ip_eth1: ""
   switch_ipmi_pos: "1/0/39"
-  ip_ib: 172.16.67.53
+  ip_ib: 172.18.65.53
   mac_ipmi: 00:E0:81:4F:E3:56
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1505,7 +1505,7 @@ griffon-54:
   ip_eth0: 172.16.65.54
   ip_eth1: ""
   switch_ipmi_pos: "1/0/40"
-  ip_ib: 172.16.67.54
+  ip_ib: 172.18.65.54
   mac_ipmi: 00:E0:81:4F:E2:CF
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1533,7 +1533,7 @@ griffon-55:
   ip_eth0: 172.16.65.55
   ip_eth1: ""
   switch_ipmi_pos: "1/0/41"
-  ip_ib: 172.16.67.55
+  ip_ib: 172.18.65.55
   mac_ipmi: 00:E0:81:4F:E2:F8
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1561,7 +1561,7 @@ griffon-56:
   ip_eth0: 172.16.65.56
   ip_eth1: ""
   switch_ipmi_pos: "1/0/42"
-  ip_ib: 172.16.67.56
+  ip_ib: 172.18.65.56
   mac_ipmi: 00:E0:81:4F:CA:89
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1589,7 +1589,7 @@ griffon-57:
   ip_eth0: 172.16.65.57
   ip_eth1: ""
   switch_ipmi_pos: "1/0/43"
-  ip_ib: 172.16.67.57
+  ip_ib: 172.18.65.57
   mac_ipmi: 00:E0:81:4F:E2:DE
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1617,7 +1617,7 @@ griffon-58:
   ip_eth0: 172.16.65.58
   ip_eth1: ""
   switch_ipmi_pos: "1/0/12"
-  ip_ib: 172.16.67.58
+  ip_ib: 172.18.65.58
   mac_ipmi: 00:E0:81:4F:E2:F3
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1645,7 +1645,7 @@ griffon-59:
   ip_eth0: 172.16.65.59
   ip_eth1: ""
   switch_ipmi_pos: "1/0/11"
-  ip_ib: 172.16.67.59
+  ip_ib: 172.18.65.59
   mac_ipmi: 00:E0:81:4F:E3:05
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1673,7 +1673,7 @@ griffon-60:
   ip_eth0: 172.16.65.60
   ip_eth1: ""
   switch_ipmi_pos: "1/0/13"
-  ip_ib: 172.16.67.60
+  ip_ib: 172.18.65.60
   mac_ipmi: 00:E0:81:4F:E3:90
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1701,7 +1701,7 @@ griffon-61:
   ip_eth0: 172.16.65.61
   ip_eth1: ""
   switch_ipmi_pos: "1/0/4"
-  ip_ib: 172.16.67.61
+  ip_ib: 172.18.65.61
   mac_ipmi: 00:E0:81:4F:E2:F2
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1729,7 +1729,7 @@ griffon-62:
   ip_eth0: 172.16.65.62
   ip_eth1: ""
   switch_ipmi_pos: "1/0/5"
-  ip_ib: 172.16.67.62
+  ip_ib: 172.18.65.62
   mac_ipmi: 00:E0:81:4F:E2:B8
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1757,7 +1757,7 @@ griffon-63:
   ip_eth0: 172.16.65.63
   ip_eth1: ""
   switch_ipmi_pos: "1/0/6"
-  ip_ib: 172.16.67.63
+  ip_ib: 172.18.65.63
   mac_ipmi: 00:E0:81:4F:E3:0B
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1785,7 +1785,7 @@ griffon-64:
   ip_eth0: 172.16.65.64
   ip_eth1: ""
   switch_ipmi_pos: "1/0/7"
-  ip_ib: 172.16.67.64
+  ip_ib: 172.18.65.64
   mac_ipmi: 00:E0:81:4F:E2:CD
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1813,7 +1813,7 @@ griffon-65:
   ip_eth0: 172.16.65.65
   ip_eth1: ""
   switch_ipmi_pos: "1/0/8"
-  ip_ib: 172.16.67.65
+  ip_ib: 172.18.65.65
   mac_ipmi: 00:E0:81:4F:E2:BC
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1841,7 +1841,7 @@ griffon-66:
   ip_eth0: 172.16.65.66
   ip_eth1: ""
   switch_ipmi_pos: "1/0/9"
-  ip_ib: 172.16.67.66
+  ip_ib: 172.18.65.66
   mac_ipmi: 00:E0:81:4F:CA:78
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1869,7 +1869,7 @@ griffon-67:
   ip_eth0: 172.16.65.67
   ip_eth1: ""
   switch_ipmi_pos: "1/0/10"
-  ip_ib: 172.16.67.67
+  ip_ib: 172.18.65.67
   mac_ipmi: 00:E0:81:4F:B5:F0
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1897,7 +1897,7 @@ griffon-68:
   ip_eth0: 172.16.65.68
   ip_eth1: ""
   switch_ipmi_pos: "1/0/11"
-  ip_ib: 172.16.67.68
+  ip_ib: 172.18.65.68
   mac_ipmi: 00:E0:81:4F:CA:8F
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1925,7 +1925,7 @@ griffon-69:
   ip_eth0: 172.16.65.69
   ip_eth1: ""
   switch_ipmi_pos: "1/0/12"
-  ip_ib: 172.16.67.69
+  ip_ib: 172.18.65.69
   mac_ipmi: 00:E0:81:4F:B5:DC
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1953,7 +1953,7 @@ griffon-70:
   ip_eth0: 172.16.65.70
   ip_eth1: ""
   switch_ipmi_pos: "1/0/13"
-  ip_ib: 172.16.67.70
+  ip_ib: 172.18.65.70
   mac_ipmi: 00:E0:81:4F:CA:77
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -1981,7 +1981,7 @@ griffon-71:
   ip_eth0: 172.16.65.71
   ip_eth1: ""
   switch_ipmi_pos: "1/0/14"
-  ip_ib: 172.16.67.71
+  ip_ib: 172.18.65.71
   mac_ipmi: 00:E0:81:4F:CB:05
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2009,7 +2009,7 @@ griffon-72:
   ip_eth0: 172.16.65.72
   ip_eth1: ""
   switch_ipmi_pos: "1/0/15"
-  ip_ib: 172.16.67.72
+  ip_ib: 172.18.65.72
   mac_ipmi: 00:E0:81:4F:B5:F1
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2037,7 +2037,7 @@ griffon-73:
   ip_eth0: 172.16.65.73
   ip_eth1: ""
   switch_ipmi_pos: "1/0/25"
-  ip_ib: 172.16.67.73
+  ip_ib: 172.18.65.73
   mac_ipmi: 00:E0:81:4F:CB:0D
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2065,7 +2065,7 @@ griffon-74:
   ip_eth0: 172.16.65.74
   ip_eth1: ""
   switch_ipmi_pos: "1/0/26"
-  ip_ib: 172.16.67.74
+  ip_ib: 172.18.65.74
   mac_ipmi: 00:E0:81:4F:CB:00
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2093,7 +2093,7 @@ griffon-75:
   ip_eth0: 172.16.65.75
   ip_eth1: ""
   switch_ipmi_pos: "1/0/27"
-  ip_ib: 172.16.67.75
+  ip_ib: 172.18.65.75
   mac_ipmi: 00:E0:81:4F:E3:75
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2121,7 +2121,7 @@ griffon-76:
   ip_eth0: 172.16.65.76
   ip_eth1: ""
   switch_ipmi_pos: "1/0/28"
-  ip_ib: 172.16.67.76
+  ip_ib: 172.18.65.76
   mac_ipmi: 00:E0:81:4F:B5:E3
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2149,7 +2149,7 @@ griffon-77:
   ip_eth0: 172.16.65.77
   ip_eth1: ""
   switch_ipmi_pos: "1/0/29"
-  ip_ib: 172.16.67.77
+  ip_ib: 172.18.65.77
   mac_ipmi: 00:E0:81:4F:E2:E0
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2177,7 +2177,7 @@ griffon-78:
   ip_eth0: 172.16.65.78
   ip_eth1: ""
   switch_ipmi_pos: "1/0/30"
-  ip_ib: 172.16.67.78
+  ip_ib: 172.18.65.78
   mac_ipmi: 00:E0:81:4F:E2:E8
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2205,7 +2205,7 @@ griffon-79:
   ip_eth0: 172.16.65.79
   ip_eth1: ""
   switch_ipmi_pos: "1/0/31"
-  ip_ib: 172.16.67.79
+  ip_ib: 172.18.65.79
   mac_ipmi: 00:E0:81:4F:E2:B2
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2233,7 +2233,7 @@ griffon-80:
   ip_eth0: 172.16.65.80
   ip_eth1: ""
   switch_ipmi_pos: "1/0/32"
-  ip_ib: 172.16.67.80
+  ip_ib: 172.18.65.80
   mac_ipmi: 00:E0:81:4F:CA:A6
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2261,7 +2261,7 @@ griffon-81:
   ip_eth0: 172.16.65.81
   ip_eth1: ""
   switch_ipmi_pos: "1/0/33"
-  ip_ib: 172.16.67.81
+  ip_ib: 172.18.65.81
   mac_ipmi: 00:E0:81:4F:CA:7D
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2289,7 +2289,7 @@ griffon-82:
   ip_eth0: 172.16.65.82
   ip_eth1: ""
   switch_ipmi_pos: "1/0/34"
-  ip_ib: 172.16.67.82
+  ip_ib: 172.18.65.82
   mac_ipmi: 00:E0:81:4F:CB:08
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2317,7 +2317,7 @@ griffon-83:
   ip_eth0: 172.16.65.83
   ip_eth1: ""
   switch_ipmi_pos: "1/0/35"
-  ip_ib: 172.16.67.83
+  ip_ib: 172.18.65.83
   mac_ipmi: 00:E0:81:4F:CA:9F
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2345,7 +2345,7 @@ griffon-84:
   ip_eth0: 172.16.65.84
   ip_eth1: ""
   switch_ipmi_pos: "1/0/36"
-  ip_ib: 172.16.67.84
+  ip_ib: 172.18.65.84
   mac_ipmi: 00:E0:81:4F:E2:D9
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2373,7 +2373,7 @@ griffon-85:
   ip_eth0: 172.16.65.85
   ip_eth1: ""
   switch_ipmi_pos: "1/0/37"
-  ip_ib: 172.16.67.85
+  ip_ib: 172.18.65.85
   mac_ipmi: 00:E0:81:4F:B5:E7
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2401,7 +2401,7 @@ griffon-86:
   ip_eth0: 172.16.65.86
   ip_eth1: ""
   switch_ipmi_pos: "1/0/39"
-  ip_ib: 172.16.67.86
+  ip_ib: 172.18.65.86
   mac_ipmi: 00:E0:81:4F:CB:0F
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2429,7 +2429,7 @@ griffon-87:
   ip_eth0: 172.16.65.87
   ip_eth1: ""
   switch_ipmi_pos: "1/0/40"
-  ip_ib: 172.16.67.87
+  ip_ib: 172.18.65.87
   mac_ipmi: 00:E0:81:4F:E2:BD
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2457,7 +2457,7 @@ griffon-88:
   ip_eth0: 172.16.65.88
   ip_eth1: ""
   switch_ipmi_pos: "1/0/41"
-  ip_ib: 172.16.67.88
+  ip_ib: 172.18.65.88
   mac_ipmi: 00:E0:81:4F:E3:8C
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2485,7 +2485,7 @@ griffon-89:
   ip_eth0: 172.16.65.89
   ip_eth1: ""
   switch_ipmi_pos: "1/0/42"
-  ip_ib: 172.16.67.89
+  ip_ib: 172.18.65.89
   mac_ipmi: 00:E0:81:4F:E3:81
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2513,7 +2513,7 @@ griffon-90:
   ip_eth0: 172.16.65.90
   ip_eth1: ""
   switch_ipmi_pos: "1/0/43"
-  ip_ib: 172.16.67.90
+  ip_ib: 172.18.65.90
   mac_ipmi: 00:E0:81:4F:CA:FC
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2541,7 +2541,7 @@ griffon-91:
   ip_eth0: 172.16.65.91
   ip_eth1: ""
   switch_ipmi_pos: "1/0/44"
-  ip_ib: 172.16.67.91
+  ip_ib: 172.18.65.91
   mac_ipmi: 00:E0:81:4F:28:B8
   bios_ver: V1.05
   bios_release: 08/21/2009
@@ -2569,7 +2569,7 @@ griffon-92:
   ip_eth0: 172.16.65.92
   ip_eth1: ""
   switch_ipmi_pos: "1/0/45"
-  ip_ib: 172.16.67.92
+  ip_ib: 172.18.65.92
   mac_ipmi: 00:E0:81:4F:E3:5D
   bios_ver: V1.05
   bios_release: 08/21/2009
diff --git a/generators/input/nancy.rb b/generators/input/nancy.rb
index c3eb68fb38658d0ccc7bcbc9ed65aac5eaec6cc9..2c6ee555f15103bd1b857b0ad881ef3b7554965d 100755
--- a/generators/input/nancy.rb
+++ b/generators/input/nancy.rb
@@ -8,10 +8,10 @@ site :nancy do |site_uid|
   sys_admin_contact "nancy-staff@lists.grid5000.fr"
   security_contact "nancy-staff@lists.grid5000.fr"
   user_support_contact "nancy-staff@lists.grid5000.fr"
-  ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} +
-    %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-xen-1.0 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+  ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-xen-1.0 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
     %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-xen-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
-    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
+    %w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
   compilation_server false
 
   cluster :griffon do |cluster_uid|
diff --git a/generators/input/orsay.rb b/generators/input/orsay.rb
index 900ba8ad054c9f1080acf96c0217fd46a6744a2a..0e952a1f19e2c2632f0b0c48ab70742f29534fe5 100755
--- a/generators/input/orsay.rb
+++ b/generators/input/orsay.rb
@@ -9,10 +9,10 @@ site :orsay do |site_uid|
   sys_admin_contact
   security_contact
   user_support_contact
-  ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
-    %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+  ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
     %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
-    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
+    %w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
 
   cluster :netgdx do |cluster_uid|
     model "IBM eServer 326m"
@@ -45,7 +45,8 @@ site :orsay do |site_uid|
         operating_system({
           :name => nil,
           :release => nil,
-          :version => nil
+          :version => nil,
+          :kernel   => "2.6.26"
         })
         storage_devices [
           {:interface => 'SATA', :size => 80.GB, :driver => nil}
diff --git a/generators/input/rennes.rb b/generators/input/rennes.rb
index 6b19428d3cc8bfe10aba786f8b1e78da504b17d2..dec7d933e99e5d0b7b14eed822aa40b3578b52c2 100755
--- a/generators/input/rennes.rb
+++ b/generators/input/rennes.rb
@@ -9,10 +9,10 @@ site :rennes do |site_uid|
   sys_admin_contact "rennes-staff@lists.grid5000.fr"
   security_contact "rennes-staff@lists.grid5000.fr"
   user_support_contact "rennes-staff@lists.grid5000.fr"
-  ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
-    %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+  ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
     %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
-    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
+    %w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
  compilation_server false
   
 end
diff --git a/generators/input/sophia.rb b/generators/input/sophia.rb
index be83766ef2a21d152bac99a8fa39f6bbc351b880..f0308debc2ff2fb12efcb39ccce40afb4ff48d03 100755
--- a/generators/input/sophia.rb
+++ b/generators/input/sophia.rb
@@ -9,10 +9,10 @@ site :sophia do |site_uid|
   sys_admin_contact "sophia-staff@lists.grid5000.fr"
   security_contact "sophia-staff@lists.grid5000.fr"
   user_support_contact "sophia-staff@lists.grid5000.fr"
-  ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
-    %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
+  ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1 etch-x64-base-2.0 etch-x64-nfs-2.0 etch-x64-big-2.0} +
     %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0 lenny-x64-base-2.0 lenny-x64-nfs-2.0 lenny-x64-big-2.0} +
-    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
+    %w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8}  ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
   compilation_server false
     
   cluster :helios do |cluster_uid|
@@ -62,7 +62,7 @@ site :sophia do |site_uid|
         network_adapters [{
             :interface => 'Ethernet',
             :rate => 1.G,
-            :mac => nil,
+            :mac => lookup('sophia',"#{node_uid}", 'mac_eth0'),
             :vendor => 'Intel Corporation',
             :version => '82546EB',
             :enabled => true,
@@ -76,7 +76,7 @@ site :sophia do |site_uid|
           },{
             :interface => 'Ethernet',
             :rate => 1.G,
-            :mac => nil,
+            :mac => lookup('sophia',"#{node_uid}", 'mac_eth1'),
             :vendor => 'Intel Corporation',
             :version => '82546EB',
             :enabled => false,
@@ -85,7 +85,7 @@ site :sophia do |site_uid|
           },{
             :interface => 'Ethernet',
             :rate => 1.G,
-            :mac => nil,
+            :mac => lookup('sophia',"#{node_uid}", 'mac_eth2'),
             :vendor => 'Intel Corporation',
             :version => '82546EB',
             :enabled => false,
@@ -94,7 +94,7 @@ site :sophia do |site_uid|
           },{
             :interface => 'Ethernet',
             :rate => 1.G,
-            :mac => nil,
+            :mac => lookup('sophia',"#{node_uid}", 'mac_eth3'),
             :vendor => 'Intel Corporation',
             :version => '82546EB',
             :enabled => false,
@@ -160,7 +160,7 @@ site :sophia do |site_uid|
         network_adapters [{
             :interface => 'Ethernet',
             :rate => 1.G,
-            :mac => nil,
+            :mac => lookup('sophia',"#{node_uid}", 'mac_eth0'),
             :vendor => 'nVidia',
             :version => 'MCP55 Pro',
             :enabled => true,
@@ -175,7 +175,7 @@ site :sophia do |site_uid|
           },{
             :interface => 'Ethernet',
             :rate => 1.G,
-            :mac => nil,
+            :mac => lookup('sophia',"#{node_uid}", 'mac_eth1'),
             :vendor => 'nVidia',
             :version => 'MCP55 Pro',
             :enabled => false,
@@ -243,7 +243,7 @@ site :sophia do |site_uid|
         network_adapters [{
             :interface => 'Ethernet',
             :rate => 1.G,
-            :mac => nil,
+            :mac => lookup('sophia',"#{node_uid}", 'mac_eth0'),
             :vendor => 'Broadcom',
             :version => 'NetXtremeII BCM5716',
             :enabled => true,
@@ -258,7 +258,7 @@ site :sophia do |site_uid|
           },{
             :interface => 'Ethernet',
             :rate => 1.G,
-            :mac => nil,
+            :mac => lookup('sophia',"#{node_uid}", 'mac_eth0'),
             :vendor => 'Broadcom',
             :version => 'NetXtremeII BCM5716',
             :enabled => false,
diff --git a/generators/input/toulouse.rb b/generators/input/toulouse.rb
index 0efc64b5d9c1e96e3d4953740c54f522d701a8ba..52beec7c1443c65adcd58305feb62e6553bde61b 100755
--- a/generators/input/toulouse.rb
+++ b/generators/input/toulouse.rb
@@ -9,10 +9,10 @@ site :toulouse do |site_uid|
   sys_admin_contact
   security_contact
   user_support_contact
-  ( %w{sid-x64-base-1.0 sid-x64-base-1.1 sid-x64-nfs-1.0 sid-x64-nfs-1.1 sid-x64-big-1.1} + 
-    %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1} +
+  ( %w{etch-x64-base-1.0 etch-x64-base-1.1 etch-x64-nfs-1.0 etch-x64-nfs-1.1 etch-x64-big-1.0 etch-x64-big-1.1} +
     %w{lenny-x64-base-0.9 lenny-x64-nfs-0.9 lenny-x64-big-0.9 lenny-x64-base-1.0 lenny-x64-nfs-1.0 lenny-x64-big-1.0}  +
-    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
+    %w{lenny-x64-base-2.3 lenny-x64-big-2.3 lenny-x64-min-0.8 lenny-x64-nfs-2.3 lenny-x64-xen-2.3} +
+    %w{squeeze-x64-base-0.8 squeeze-x64-big-0.8 squeeze-x64-min-0.8 squeeze-x64-nfs-0.8 squeeze-x64-xen-0.8} ).each{|env_uid| environment env_uid, :refer_to => "grid5000/environments/#{env_uid}"}
 
   cluster :violette do |cluster_uid|
     model "Sun Fire V20z"