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 f4ee8e53ef4d55108004fa0d2985069079ca50f0..686a39ac3d7658e74f15165c03497b0b1ebda682 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x003048ffffcc1755",
       "interface": "InfiniBand",
       "ip": "172.16.18.131",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
index 9cb9d918a6e70ce920fb5faaed429a946b77f7bf..65eeba90d96e1ae5facc8bf17f2ce95f6beb7c2d 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x003048ffffcc1769",
       "interface": "InfiniBand",
       "ip": "172.16.18.140",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
index 70100c87c4b85f8cfbdfa51c5add3fcefd3d36c4..f136b8e97e63325d3984d11c46b1a46961baa141 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-11.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c9030007bfe3,0x0002c9030007bfe4",
       "interface": "InfiniBand",
       "ip": "172.16.18.141",
       "management": false,
@@ -54,6 +55,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c9030007bfe3,0x0002c9030007bfe4",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
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 58959202265b5d84cce902ed5730295d8592a80a..f65490e7d737dea40af821dd41c709fd9ddcbec4 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-12.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c9030001570d,0x0002c9030001570e",
       "interface": "InfiniBand",
       "ip": "172.16.18.142",
       "management": false,
@@ -54,6 +55,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c9030001570d,0x0002c9030001570e",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
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 af62c4de1fc22720345005dc44774d17aef8a18a..45151934ef8dbe7d04681404e37d732edb8d8d9e 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x003048ffffcc1759",
       "interface": "InfiniBand",
       "ip": "172.16.18.132",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
index 67617291317f53252adc70c6e16040d18e1bf144..f4a96297680935d94938d11b87477898e5abdc43 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x003048ffffcc3d49",
       "interface": "InfiniBand",
       "ip": "172.16.18.133",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
index c17aaf2269342c342475a215802dc0513e2730e3..d61ec874200320d92b73d78f558afce7ee1cebce 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x003048ffffcc3d45",
       "interface": "InfiniBand",
       "ip": "172.16.18.134",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
index 2904ac01ca474368347020d85e67b30026e2fec5..230bcced2ca02fd3fb11eeeb57c3b8e7e44a64ad 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x003048ffffcc1465",
       "interface": "InfiniBand",
       "ip": "172.16.18.135",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
index ca5df8707aabaee64b16ed9e2468ddc5b8896673..d45fa7e2a043fbb4b9a33ae8cc850365fa0e51fb 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x003048ffffcc4265",
       "interface": "InfiniBand",
       "ip": "172.16.18.136",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
index 9b5461f89224e4e2e4f68c0bb88c9b7a9f4ca03f..859ff0c8b234e04f48937dab739cea10bcce9c87 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x003048ffffcc3d41",
       "interface": "InfiniBand",
       "ip": "172.16.18.137",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
index 8aea4bd403c5dd9f5647f4081aef24b5374c6340..d362ff733e86576522c5ae5177056cd4635fe4e9 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x003048ffffcc3d51",
       "interface": "InfiniBand",
       "ip": "172.16.18.138",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
index 760b39f402e3b686d0f2bc86dae345d8e71e7cad..f0dbf841acc5875e1656b4bd41e477591331d51e 100644
--- a/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
+++ b/data/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.139",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
index c2936577e57ab3eb1e92d67055e2e5ce9bd1e439..788255c335863b250aaf955ded008baa39c69d49 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-1.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.51",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
index 5e87b7063e1cf9bb61a18cfcd894675cc5b489b1..51c6fe36b1c23b7662d95c5c976af5f8fb38b899 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-10.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.60",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
index b38e43c72503a8468e34c89fcadfa58507f17d12..868dc5e8bdaddcd25c49d65a3966784c614a5345 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-11.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c959",
       "interface": "InfiniBand",
       "ip": "172.16.18.61",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c959",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
index cdfc6c656916fd19cc1e2e8ce760abf824c753f8..77396bd734310a6ecdb505c6b3399a5581cd99d2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-12.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.62",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
index 3592add999234d10e447bf0c1bdba43c833ca597..368d80cfe51ec38d3e8232f893a94961da3775ad 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-13.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9cb",
       "interface": "InfiniBand",
       "ip": "172.16.18.63",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9cb",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
index a8ccf9394914677cc4c2f4d19cfb8b2f7f837ffa..6cf3454fe21ab82558cd7f7f767c39465712837d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-14.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.64",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
index 157ce6b2ef841abc843ff1d58ba305c7d4383b91..4bfd387eaf4ca5852ec8a1ecb19407cfaea2c52c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-15.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9fb",
       "interface": "InfiniBand",
       "ip": "172.16.18.65",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9fb",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
index 5e4013b3483dbcbd3cb3978d3436d311a2ee5424..56cfc559174fdc9a4f467b60c32c4490ca0e85e1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-16.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca13",
       "interface": "InfiniBand",
       "ip": "172.16.18.66",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca13",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
index d36f5118896ac775b6ce2bff29958fd5610728d5..603203939c2ac3422c571d7bc3784a9f152139dd 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-17.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c96e",
       "interface": "InfiniBand",
       "ip": "172.16.18.67",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c96e",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
index 0e9d142890b61a0bf1b53006f6ceab91c991e6e8..a24bc5ded4f35f303e83d0208fae5bdaaaedea33 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-18.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.68",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
index cc58b2f0c2ddcc273a2939ef649b6d3f917cffa7..afaba72be5bd2fde2d346fbfb48dbb7f23f61542 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-19.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9b9",
       "interface": "InfiniBand",
       "ip": "172.16.18.69",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9b9",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
index 349cf55e439e21d9fb573bbbaaa47219a453ed31..df1fec14e65e25233ea8be2cce06bbfd55ef17f9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-2.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.52",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
index f236f4cf091759df19a268661b5c615cd2a5f542..4d16ad9e79acf4afd66cb6105a7da5d27d6e66e3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-20.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.70",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
index 0fa7795aea6c487f17a538bb2bf15ae4846825c8..e3c4fb07f721bd9f719e6173b6219709382e708c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-21.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.71",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
index e1b8289257a856dc3dd6ac1fa4cf9cb7e46e5a38..e6902730981e8b4d1e1cfc5e449b071a0d279969 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-22.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.72",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
index 097acc7e965c66de0368a848518ffafdd323e504..ba5e4ad8331b279a87578bf9050d0baf2bb350cc 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-23.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9c2",
       "interface": "InfiniBand",
       "ip": "172.16.18.73",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9c2",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
index d5d2efcb4e0e0a3a907e7155dae96eaf48720081..e62fd98a8cfb5cab550790bb8255e732d9ada0c6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-24.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.74",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
index 7126880613192a4894f59ccf495f6ee5a2a5dc0b..c60ad542f2ff0296450fb72ea877ded1312b87ae 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-25.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c815",
       "interface": "InfiniBand",
       "ip": "172.16.18.75",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c815",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
index 5ded3a28a389bd74aeb9b4d6be4cc9d346f4d5d4..39e249c933fc0ea792367909110391967fa1de19 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-26.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c8ff",
       "interface": "InfiniBand",
       "ip": "172.16.18.76",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c8ff",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
index 4894eb2059c7fc01b668f792e6266095053ced59..75e0e8b80091251697e3f48741cdcbc9ccf84faf 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-27.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca5e",
       "interface": "InfiniBand",
       "ip": "172.16.18.77",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca5e",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
index 6bca6c9df893585390e96ade54c831062da94819..d8b85086953958b3f979c9df3cd958b1e8fe39d2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-28.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca6d",
       "interface": "InfiniBand",
       "ip": "172.16.18.78",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca6d",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
index 57f0dd5a9866bb2956fd108a620970b57deb53d7..e37138ffbe334be59c483d04befadcadbdc8eab7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-29.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c99e",
       "interface": "InfiniBand",
       "ip": "172.16.18.79",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c99e",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
index 5c0846a347eb223a8e44837e82014dd733c0f649..f6d8c8f75b4967ed61f17082588b31f2053bf4db 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-3.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.53",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
index 9ae5f927219dcb7fdd565c0fbad14b5592c195e0..36d13910465b4a5d5fec9fd709f25b510ab42454 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-30.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.80",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
index 4426d86f735989fc7226813ec6ddd2a584e9cddb..719e5ad5009350db1504544d8c6b762e95e46f57 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-31.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.81",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
index d5db4d8dbda708ee8a63e473cf857b7da8365b23..7b3c6478d2bf563d861eb463c5c7d7814b25121c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-32.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c8ea",
       "interface": "InfiniBand",
       "ip": "172.16.18.82",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c8ea",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
index 4e747172b1af8afe78ebe08b8fc6425ae4af235a..bda1bc7f045950f5d2a755f3e9ee552f7bdff943 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-33.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.83",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
index ae3f3aaa809a08ced874268c93b105a6a5ea7491..718eef6ad8a5156b81bda10e52a59bad175883f2 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-34.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.84",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
index ae8ae814078b6a4d42d697e7e27a12e35211c2de..9501559b471f18bbcf929ee9d01c965d56fc2f1b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-35.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c914",
       "interface": "InfiniBand",
       "ip": "172.16.18.85",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c914",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
index 4375faabd28654fd3df0dc3d7131e9d10c712f8e..dd08c78c090e17fefb5308697223db9090266368 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-36.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.86",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
index b80b46ed8c8fc59517b0ee39596aea82906bfca1..35d2a5b8aed599a81d184f6374c2495034c6360b 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-37.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.87",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
index 6eb7a22a2339a4d06fc39e5f1eb0f7d12d213ab5..ee2d26fd6df69d4595f2e3d9e47bb756bf3a82e7 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-38.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9bc",
       "interface": "InfiniBand",
       "ip": "172.16.18.88",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9bc",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
index a8ce3b00dfdcdd747fbe3ef584b75a1fb03ad845..feb2ec5a6063efac31642ef0bd86e2a3cccaa043 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-39.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca40",
       "interface": "InfiniBand",
       "ip": "172.16.18.89",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca40",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
index 094cde3319f8f472483230a9543327ebe5add406..d9e798d72505669d239f345f28235d443cc2ec0e 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-4.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.54",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
index e2a14780a8e4b6fcd9ec116c56b87bcde38509d6..b66b46d8e86966a72672ddf9812f15b0dd6b503d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-40.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c97d",
       "interface": "InfiniBand",
       "ip": "172.16.18.90",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c97d",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
index a677fa756e19296c32e2f61f042301b8961e8554..5e7eb48645d106c67bac7913642072fbbed550d0 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-41.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.91",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
index db7635c45284348af9e0c119b441bcd0ca554db0..e9c3c8a52198a74b3f64fb2665761cce7c9c861a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-42.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x08003800013729c5",
       "interface": "InfiniBand",
       "ip": "172.16.18.92",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x08003800013729c5",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
index 466dfd10224ca295b415e7eba7ef64b0447046b8..91dae386c00029390f541a25efb08f17b398b29a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-43.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.93",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
index fe220e3448fa1b8f46204d706c4fd7da70a4c484..481fa3bdfd04e4c3934cef11c49099be3a8a8288 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-44.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c980",
       "interface": "InfiniBand",
       "ip": "172.16.18.94",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c980",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
index 1f81b69ed0d23cb173fb7f78d4fc660c46c4598c..b32d16a31767cdf60691f9fa01be0485ca1d9ffa 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-45.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca34",
       "interface": "InfiniBand",
       "ip": "172.16.18.95",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca34",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
index 08021e6fdb3f391d8c39456a39b3076970920bef..b133a5802ae88d5dee7ddff068372d7a0a56746c 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-46.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.96",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
index 211e5b2c76b83c5fdf87b600842b92738ba11f52..4529fe21669f03e5ade1f7c828bcb18d22290ca1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-47.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c99b",
       "interface": "InfiniBand",
       "ip": "172.16.18.97",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c99b",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
index 2583923a0d0ecb2d88453eeb7c113110255a3e95..de54ab51fab314f1f35bc8d89127c2413ccf3ba6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-48.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c929",
       "interface": "InfiniBand",
       "ip": "172.16.18.98",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c929",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
index d9ddb665cdad2527290ad020b0cfc6b7d6dbe925..48b077bc94735a7c072ae935516675b17ab46930 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-49.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c992",
       "interface": "InfiniBand",
       "ip": "172.16.18.99",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c992",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
index b25d6c06dc966796d37ac45095a653691ade3447..4f73be60eea526db7a67062397989efd5f20f813 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-5.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.55",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
index 11b04729e647a8538678038128e31fb268191536..858aabf2de8a56688a67912e1f4d5761ebaecfe4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-50.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca19",
       "interface": "InfiniBand",
       "ip": "172.16.18.100",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca19",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
index 586079b4eb1f345b9060a182a2f265e661c40a9c..0567dcacb5335a92365b2407bdcb56ad154146a9 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-51.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca61",
       "interface": "InfiniBand",
       "ip": "172.16.18.101",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca61",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
index 7dbe74b9fb24633a1e8840ca0453e63660a0ebdb..c7375226fc70d980c2fee2c2fd7af486b830314f 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-52.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca28",
       "interface": "InfiniBand",
       "ip": "172.16.18.102",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca28",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
index 8c14527bed2eb2a156237bb42a4277f9fafe102d..f0d7537f27ca86183d68d45425e5a1a5826164e6 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-53.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca4f",
       "interface": "InfiniBand",
       "ip": "172.16.18.103",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca4f",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
index 35bed6cc66cf660d6006e52b21400eb5f367e1fd..d9ff5e7378251e93bc1071b0fa8822d07bbc0e03 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-54.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca58",
       "interface": "InfiniBand",
       "ip": "172.16.18.104",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca58",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
index 0dfc8135e02e4e538e7f9671bddadc11e131af28..51d02c0ebc927390fa88a34de936e4dde61ef779 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-55.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9dd",
       "interface": "InfiniBand",
       "ip": "172.16.18.105",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9dd",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
index 777f63356b4aa58226ed31baa8e99b249bfe7cc1..6c9d07394bf040a4f059d398c9d316e8430fafac 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-56.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca01",
       "interface": "InfiniBand",
       "ip": "172.16.18.106",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca01",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
index 78bb7b53785afa9d4f1a07e2f32faa9c105716a4..3ef3ca9c064f1ad94309c34ff941c8a4b9f23955 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-57.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c986",
       "interface": "InfiniBand",
       "ip": "172.16.18.107",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c986",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
index bf511294bfe9dc5d049f2a9886936e3e46a42e89..1f7b7c47f331b0a84192cf37fe2d41242b0cdb07 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-58.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca0d",
       "interface": "InfiniBand",
       "ip": "172.16.18.108",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca0d",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
index e19af1048e8907b3ab395d66bd0887eef29cbc51..d9bf6e6d664e8fc441daccd62f69543a727cd0f3 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-59.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c908",
       "interface": "InfiniBand",
       "ip": "172.16.18.109",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c908",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
index dc1f8416c4162f423fe6c44e9b713792571109a5..c7590c68f12253bec88e55a32cd3f1f1cc259613 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-6.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca7f",
       "interface": "InfiniBand",
       "ip": "172.16.18.56",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca7f",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
index 203c1edd9c06b71a15111860c3e4d21aab74d21a..f93729ee0bab6774e535bc4d482a1ed79bf3fb19 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-60.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca37",
       "interface": "InfiniBand",
       "ip": "172.16.18.110",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca37",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
index 0b26dc271d7b8183d231881efe2ab5f935336e7c..5c55491594f7094781303ef0ed84bbe8127a2a1d 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-61.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c90b",
       "interface": "InfiniBand",
       "ip": "172.16.18.111",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c90b",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
index 09e6c535977c6562724840534f0d83724ec38ce7..3aa0da3b0b4cc035c530050f6b5cc51a6d7a8660 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-62.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9c8",
       "interface": "InfiniBand",
       "ip": "172.16.18.112",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9c8",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
index c53ce22d67d9bcb250958234d6f9791f20253920..6ad4322c14ef23eef21df33ae9bf00e6725896a1 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-63.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c98c",
       "interface": "InfiniBand",
       "ip": "172.16.18.113",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c98c",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
index 258c812cb16d9a338b7cd4f2fc84bfe20ed899b8..f69d71518de0129860f13dfc948990f48ec57b52 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-64.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135cc9e",
       "interface": "InfiniBand",
       "ip": "172.16.18.114",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135cc9e",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
index 5488416fa310580c4c663b53329d67a3c64fda6a..3cb412d4f3c37361c3752512d1c844ab487ef3ef 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-65.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9d7",
       "interface": "InfiniBand",
       "ip": "172.16.18.115",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9d7",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
index b6e6d13c9d7f38eae7dfcc1f51df02cc469ea592..18b9f92958f84378aa4d81c7b6a6feb4876b5959 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-66.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca1f",
       "interface": "InfiniBand",
       "ip": "172.16.18.116",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca1f",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
index 4e98ed352280dfcecdc4ee737249411e52130ca7..108230c46b31237b2d436a1c75f88c93f926f7bd 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-67.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9f8",
       "interface": "InfiniBand",
       "ip": "172.16.18.117",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9f8",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
index 1fbf03040219b38cdcc6e9cf9688dabd77619969..77e7bf9300d068699505fa194f5258c7c5d25562 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-68.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c989",
       "interface": "InfiniBand",
       "ip": "172.16.18.118",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c989",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
index 17f64a9f623cc77174b49401db1edf1b0decd22b..981503d94870e1c36dc92b83dcaf6112f67a57bb 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-69.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca9d",
       "interface": "InfiniBand",
       "ip": "172.16.18.119",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca9d",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
index 210922e1a11e675757adc0a0a274267a099c1c30..ead43b06aba09bc423708a00192deabf455962d4 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-7.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c8e1",
       "interface": "InfiniBand",
       "ip": "172.16.18.57",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c8e1",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
index 0eed3fe689d1856a2bdf5eb2b9b27e5b460145be..5a32afd8ddaaa73d759882d4dbab84b6e2d45a68 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-70.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca9a",
       "interface": "InfiniBand",
       "ip": "172.16.18.120",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135ca9a",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
index a8ca298b35e0d628935561f81277028f510f005d..d0ad7985cb637dc52894eb26e0681c5f953325eb 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-71.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c91a",
       "interface": "InfiniBand",
       "ip": "172.16.18.121",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c91a",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
index 5c5de25b88441d821802bca09671dae896f299dc..dc743c7b28b044319edb1ab0879e9863d60e9b0a 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-72.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.122",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
index c2f9a2a0038cf06c0243a1dfad3ad7dcceeedb77..935fcb975fe7e51a587209e035b9da47cf3a6d18 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-8.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c902",
       "interface": "InfiniBand",
       "ip": "172.16.18.58",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c902",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
index d69457ed8e531cf6412425deeb239b63196db42c..88e2acb716c775586edcacd91e04de85886c0b38 100644
--- a/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
+++ b/data/grid5000/sites/grenoble/clusters/edel/nodes/edel-9.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9c5",
       "interface": "InfiniBand",
       "ip": "172.16.18.59",
       "management": false,
@@ -27,6 +28,7 @@
       "device": "ib1",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x080038000135c9c5",
       "interface": "InfiniBand",
       "ip": "",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
index e84b8b657d8f92fcc6f3339c4d3fc8a1d69254d9..1eb77a0de08bdccb11f5bb993f9d8d1e1037d56b 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-1.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.1",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
index d3a25c347a90326bb1e1646fa8f40eab81bd7bb8..3f7479eec6943fddc3093d0fea7a8de3d1fbf1ba 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-10.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.10",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
index 17a61470f0938449dcbdd32a8f88ab6b1bfd908f..c2a7c585045bc184ea8978af2f37a898b7579ab9 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-11.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c90300015431,0x0002c90300015432",
       "interface": "InfiniBand",
       "ip": "172.16.18.11",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
index 12d0a0ab3a1d6f0360e132981ad312b9967d5c8d..9a0687959a6760a96e83bc5d1f2ce6e3f7998b0c 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-12.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c903000159a1,0x0002c903000159a2",
       "interface": "InfiniBand",
       "ip": "172.16.18.12",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
index 19d5824ff03394da25ab31f9cb8d0343b959cbd4..b7b22f8d834565fa2c5e4e256b6361ac2af7ac71 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-13.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c903000155c9,0x0002c903000155ca",
       "interface": "InfiniBand",
       "ip": "172.16.18.13",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
index 28e5a74073cca6ca5e09ff1c81a745ba968311aa..03089825411ba356509280041c9ee59485c5f9fe 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-14.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c903000155cd,0x0002c903000155ce",
       "interface": "InfiniBand",
       "ip": "172.16.18.14",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
index a205206ca5b2dee9530c452f1bd954c5da7bf86e..a731f6a761c804d151872ed1b03a17b9ac9f8001 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-15.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c903000155d9,0x0002c903000155da",
       "interface": "InfiniBand",
       "ip": "172.16.18.15",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
index e6a1db2c2dd8ab2f37ac28213a6e52f126d3155e..4fa7d0b54850bf52a912433043be6b06f7594859 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-16.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c903000155e9,0x0002c903000155ea",
       "interface": "InfiniBand",
       "ip": "172.16.18.16",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
index 188d508027290fd693e74aec385f858723b5350d..b14fc36c00ef7d2b4245bac61fcc1394642af99d 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-17.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c903000155e1,0x0002c903000155e2",
       "interface": "InfiniBand",
       "ip": "172.16.18.17",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
index c1b3697a5b3acf827fa5194414b681466c3cfd3a..394cb972d2e2e50663a0a790e87f6bbb2efec4d2 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-18.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c903000155d5,0x0002c903000155d6",
       "interface": "InfiniBand",
       "ip": "172.16.18.18",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
index 7453ae2f15564e31004831310f8acaea7f14d9aa..f765ca8840d8091dfde4a127fe4ed2e63cf89d20 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-19.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c9030001565d,0x0002c9030001565e",
       "interface": "InfiniBand",
       "ip": "172.16.18.19",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
index ef3ce880ee6d6755fe4e5c5dbfe267e604911c24..2e775d1d26c74bff452aeb96e836af5487f7a7b0 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-2.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c903000158d5,0x0002c903000158d6",
       "interface": "InfiniBand",
       "ip": "172.16.18.2",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
index 8298b6413b636af313acb2b94bcc5beae68b4f0f..3dd144c416774c084749f0d00e9a7c15fafe2565 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-20.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c903000155e5,0x0002c903000155e6",
       "interface": "InfiniBand",
       "ip": "172.16.18.20",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
index 75380fd9f1d4ac455171742b8756aeb9cc5257ab..bd9326eaf08888303883385e196c30752342a9b8 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-21.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c903000155d1,0x0002c903000155d2",
       "interface": "InfiniBand",
       "ip": "172.16.18.21",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
index 36d782a86c96ce1cb5743cd023070c4642c4eecd..c67e5e1c0963cc98c2800c3a2ed8e3096f63d8ba 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-22.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c903000155c1,0x0002c903000155c2",
       "interface": "InfiniBand",
       "ip": "172.16.18.22",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
index 7827c6cbcd4e97941f55af0947762e17797c3007..51a9fce8b0e97847eaedbc152c458e439a72dd70 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-23.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c90300015631,0x0002c90300015632",
       "interface": "InfiniBand",
       "ip": "172.16.18.23",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
index 6ff707b69f0b61688f0c2e819a1bb1ca2542df50..f58042fe970ab3f851d46d6caedd2f7939aa696b 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-24.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c90300015b01,0x0002c90300015b02",
       "interface": "InfiniBand",
       "ip": "172.16.18.24",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
index 7c0a0c0f52e479430b374059ee8e6b58bd463b7c..549112a1f68d0221b558794e24459b7cb064c4df 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-25.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.25",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
index 54f11511a0ce5e23a29d274585457da116bebcf9..cfc9c5cc5bad8a06916dd17a68c0238bc60be82b 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-26.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.26",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
index ede5670879cde332c9c9ff4bcd51a39f7b31f212..0b31c98f7ed1a2dcc2a7a836e17693f6d19992f1 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-27.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c90300015731,0x0002c90300015732",
       "interface": "InfiniBand",
       "ip": "172.16.18.27",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
index a1b8337e740dd235955f51e3347cb0014ee7f62d..88d4cbe55712dd2c9da1bdd3257a4a70c8263549 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-28.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c90300015659,0x0002c9030001565a",
       "interface": "InfiniBand",
       "ip": "172.16.18.28",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
index 08d0f63f82158d8d822661cd967d0de2c40d1484..9693361ed2897e18e06cefaab7e1073245a889c9 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-29.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c903000155b5,0x0002c903000155b6",
       "interface": "InfiniBand",
       "ip": "172.16.18.29",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
index 606d8bf0250c78ea060209d6151b4f0f1b007adc..7568725333a7469f77210a27368232b83dddbd00 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-3.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.3",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
index 3f47096c700f3ffcc426a916ea478fef2aecf07b..4b527d4b92b5a98457c0aed12a70fb95852d3c9a 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-30.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c90300015661,0x0002c90300015662",
       "interface": "InfiniBand",
       "ip": "172.16.18.30",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
index 62716c6930926933e968e1e789902ba4dcff5c2e..69635ac871579631ec478656c8b7aad2d326f5b4 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-31.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.31",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
index 26a85aabd96d109f6d3a1553cdc51d9bfda2e609..a1e34b193173488201aa731426a0e88af5276bb5 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-32.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c903000155ed,0x0002c903000155ee",
       "interface": "InfiniBand",
       "ip": "172.16.18.32",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
index 0ef40f036e18385424f145be49312c79688a815b..f320708c52716662a341e4d6e27344a780e92507 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-33.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c90300015805,0x0002c90300015806",
       "interface": "InfiniBand",
       "ip": "172.16.18.33",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
index 4e1431efaa0da320e52ba969d346b612876cc129..11d058c12d955856fbff1400e8ca79db75fe0b3e 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-34.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c90300015655,0x0002c90300015656",
       "interface": "InfiniBand",
       "ip": "172.16.18.34",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
index 8e736c7cf5e6a8f992a7fc41ad746df75360e4a6..75744c2f7b9c45f2b69ed2580d83f9cdbc4e6b9a 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-4.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c903000158bd,0x0002c903000158be",
       "interface": "InfiniBand",
       "ip": "172.16.18.4",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
index 56e1616a6ceda03098e85fb3fbe21f98b400b809..a5ac5214f889dded0e6f72404927467b58f3d5a4 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-5.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c90300015b0d,0x0002c90300015b0e",
       "interface": "InfiniBand",
       "ip": "172.16.18.5",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
index b5003c791f1f9734c4268c6813221109131db499..b241608aa1e9ad6b56e0fa0385017bc3388a1fe0 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-6.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": null,
       "interface": "InfiniBand",
       "ip": "172.16.18.6",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
index bc169553109a1d8450a502454c3e8d60a35fa82c..c517712b3cb1dff6516747bfc083add00de15ae9 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-7.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c903000159ad,0x0002c903000159ae",
       "interface": "InfiniBand",
       "ip": "172.16.18.7",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
index 24cdf3bb57d6066c66a3ae81a10118c601f2c386..79716159c268e7e19051d276a7f3f69047b2f236 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-8.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c90300015b19,0x0002c90300015b1a",
       "interface": "InfiniBand",
       "ip": "172.16.18.8",
       "management": false,
diff --git a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
index a09b1fae3ea1f9aad6df4b07c10b5a7cd7eefa21..c5788eed9dab3924af1044006d5e7942ee1ac613 100755
--- a/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
+++ b/data/grid5000/sites/grenoble/clusters/genepi/nodes/genepi-9.json
@@ -13,6 +13,7 @@
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
+      "ib_guid": "0x0002c90300015b15,0x0002c90300015b16",
       "interface": "InfiniBand",
       "ip": "172.16.18.9",
       "management": false,
diff --git a/generators/input/grenoble.rb b/generators/input/grenoble.rb
index ab53400c08e2cf79fc7baa30353db010328f0761..fdf897ffb4690a562f4e3d1733e6cc606b607a3b 100755
--- a/generators/input/grenoble.rb
+++ b/generators/input/grenoble.rb
@@ -66,7 +66,8 @@ site :grenoble do |site_uid|
           :version => "InfiniHost MHGH29-XTC",
           :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
           :ip => dns_lookup_through_ssh(ssh,"#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
-          :driver => "mlx4_core"
+          :driver => "mlx4_core",
+          :ib_guid => lookup('grenoble', "#{node_uid}", 'ib_guid')
         },
         {
           :interface => 'Ethernet',
@@ -156,7 +157,8 @@ site :grenoble do |site_uid|
           :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_through_ssh(ssh, "#{node_uid}-ib0.#{site_uid}.grid5000.fr")
+          :ip => dns_lookup_through_ssh(ssh, "#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
+          :ib_guid => lookup('grenoble', "#{node_uid}", 'ib_guid')
         },
         {
           :interface => 'Ethernet',
@@ -245,7 +247,8 @@ site :grenoble do |site_uid|
           :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_through_ssh(ssh,"#{node_uid}-ib0.#{site_uid}.grid5000.fr")
+          :ip => dns_lookup_through_ssh(ssh,"#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
+          :ib_guid => lookup('grenoble', "#{node_uid}", 'ib_guid')
         },
         {
           :interface => 'Ethernet',
@@ -285,7 +288,8 @@ site :grenoble do |site_uid|
           :vendor => 'Mellanox',
           :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s  (rev a0)",
           :ip => "",
-          :driver => "mlx4_core"
+          :driver => "mlx4_core",
+          :ib_guid => lookup('grenoble', "#{node_uid}", 'ib_guid')
         },
         {
           :interface => 'Ethernet',
@@ -353,7 +357,8 @@ site :grenoble do |site_uid|
           :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_through_ssh(ssh,"#{node_uid}-ib0.#{site_uid}.grid5000.fr"),
-          :driver => "mlx4_core"
+          :driver => "mlx4_core",
+          :ib_guid => lookup('grenoble', "#{node_uid}", 'ib_guid')
         },
         {
           :interface => 'InfiniBand',
@@ -365,9 +370,9 @@ site :grenoble do |site_uid|
           :management => false,
           :vendor => 'Mellanox',
           :version => "MT26428 ConnectX IB QDR, PCIe 2.0 5.0GT/s (rev a0)",
+          :ip => "",
           :driver => "mlx4_core",
-          :ip => ""
-
+          :ib_guid => lookup('grenoble', "#{node_uid}", 'ib_guid')
         },
         {
           :interface => 'Ethernet',
diff --git a/generators/input/grenoble.yaml b/generators/input/grenoble.yaml
index 7fe30234d222e51846fb71160f4e249bfd13ad31..f85f709ef719980d5485bae2627604ce8c9f2667 100644
--- a/generators/input/grenoble.yaml
+++ b/generators/input/grenoble.yaml
@@ -1,4 +1,5 @@
-adonis-10:
+--- 
+adonis-10: 
   mac_eth0: 00:30:48:cc:83:10
   ip_eth0: 172.16.16.140
   mac_eth1: 00:30:48:cc:83:11
@@ -6,7 +7,8 @@ adonis-10:
   ip_ib0: 172.16.18.140
   ip_mgt: 192.168.2.140
   mac_mgt: 00:30:48:cc:ad:df
-adonis-11:
+  ib_guid: "0x003048ffffcc1769"
+adonis-11: 
   mac_eth0: 00:30:48:da:6f:66
   ip_eth0: 172.16.16.141
   mac_eth1: 00:30:48:da:6f:67
@@ -15,7 +17,8 @@ adonis-11:
   ip_ib1: ""
   ip_mgt: 192.168.2.141
   mac_mgt: 00:30:48:da:77:38
-adonis-12:
+  ib_guid: 0x0002c9030007bfe3,0x0002c9030007bfe4
+adonis-12: 
   mac_eth0: 00:25:90:01:eb:fc
   ip_eth0: 172.16.16.142
   mac_eth1: 00:25:90:01:eb:fd
@@ -24,7 +27,8 @@ adonis-12:
   ip_ib1: ""
   ip_mgt: 192.168.2.142
   mac_mgt: 00:25:90:01:e7:fb
-adonis-1:
+  ib_guid: 0x0002c9030001570d,0x0002c9030001570e
+adonis-1: 
   mac_eth0: 00:30:48:cc:7f:d8
   ip_eth0: 172.16.16.131
   mac_eth1: 00:30:48:cc:7f:d9
@@ -32,7 +36,8 @@ adonis-1:
   ip_ib0: 172.16.18.131
   ip_mgt: 192.168.2.131
   mac_mgt: 00:30:48:cc:b0:58
-adonis-2:
+  ib_guid: "0x003048ffffcc1755"
+adonis-2: 
   mac_eth0: 00:30:48:cc:7f:da
   ip_eth0: 172.16.16.132
   mac_eth1: 00:30:48:cc:7f:db
@@ -40,7 +45,8 @@ adonis-2:
   ip_ib0: 172.16.18.132
   ip_mgt: 192.168.2.132
   mac_mgt: 00:30:48:cc:b0:59
-adonis-3:
+  ib_guid: "0x003048ffffcc1759"
+adonis-3: 
   mac_eth0: 00:30:48:cd:c6:a4
   ip_eth0: 172.16.16.133
   mac_eth1: 00:30:48:cd:c6:a5
@@ -48,7 +54,8 @@ adonis-3:
   ip_ib0: 172.16.18.133
   ip_mgt: 192.168.2.133
   mac_mgt: 00:30:48:cc:b5:f6
-adonis-4:
+  ib_guid: "0x003048ffffcc3d49"
+adonis-4: 
   mac_eth0: 00:30:48:cd:c0:ac
   ip_eth0: 172.16.16.134
   mac_eth1: 00:30:48:cd:c0:ad
@@ -56,7 +63,8 @@ adonis-4:
   ip_ib0: 172.16.18.134
   ip_mgt: 192.168.2.134
   mac_mgt: 00:30:48:cc:b6:6c
-adonis-5:
+  ib_guid: "0x003048ffffcc3d45"
+adonis-5: 
   mac_eth0: 00:30:48:cc:7e:0a
   ip_eth0: 172.16.16.135
   mac_eth1: 00:30:48:cc:7e:0b
@@ -64,7 +72,8 @@ adonis-5:
   ip_ib0: 172.16.18.135
   ip_mgt: 192.168.2.135
   mac_mgt: 00:30:48:cc:af:61
-adonis-6:
+  ib_guid: "0x003048ffffcc1465"
+adonis-6: 
   mac_eth0: 00:30:48:cc:7a:bc
   ip_eth0: 172.16.16.136
   mac_eth1: 00:30:48:cc:7a:bd
@@ -72,7 +81,8 @@ adonis-6:
   ip_ib0: 172.16.18.136
   ip_mgt: 192.168.2.136
   mac_mgt: 00:30:48:cc:ad:f2
-adonis-7:
+  ib_guid: "0x003048ffffcc4265"
+adonis-7: 
   mac_eth0: 00:30:48:cd:c6:80
   ip_eth0: 172.16.16.137
   mac_eth1: 00:30:48:cd:c6:81
@@ -80,7 +90,8 @@ adonis-7:
   ip_ib0: 172.16.18.137
   ip_mgt: 192.168.2.137
   mac_mgt: 00:30:48:cc:b5:e4
-adonis-8:
+  ib_guid: "0x003048ffffcc3d41"
+adonis-8: 
   mac_eth0: 00:30:48:cd:c0:ae
   ip_eth0: 172.16.16.138
   mac_eth1: 00:30:48:cd:c0:af
@@ -88,7 +99,8 @@ adonis-8:
   ip_ib0: 172.16.18.138
   ip_mgt: 192.168.2.138
   mac_mgt: 00:30:48:cc:b6:6d
-adonis-9:
+  ib_guid: "0x003048ffffcc3d51"
+adonis-9: 
   mac_eth0: 00:30:48:cb:cf:7e
   ip_eth0: 172.16.16.139
   mac_eth1: 00:30:48:cb:cf:7f
@@ -96,7 +108,7 @@ adonis-9:
   ip_ib0: 172.16.18.139
   ip_mgt: 192.168.2.139
   mac_mgt: 00:30:48:cc:ac:d1
-edel-10:
+edel-10: 
   mac_eth0: 08:00:38:35:ab:94
   ip_eth0: 172.16.16.60
   mac_eth1: 08:00:38:35:ab:95
@@ -105,7 +117,7 @@ edel-10:
   ip_ib1: ""
   ip_mgt: 192.168.2.60
   mac_mgt: ""
-edel-11:
+edel-11: 
   mac_eth0: 08:00:38:35:ab:90
   ip_eth0: 172.16.16.61
   mac_eth1: 08:00:38:35:ab:91
@@ -114,7 +126,8 @@ edel-11:
   ip_ib1: ""
   ip_mgt: 192.168.2.61
   mac_mgt: ""
-edel-12:
+  ib_guid: "0x080038000135c959"
+edel-12: 
   mac_eth0: 08:00:38:35:ac:3c
   ip_eth0: 172.16.16.62
   mac_eth1: 08:00:38:35:ac:3d
@@ -123,7 +136,7 @@ edel-12:
   ip_ib1: ""
   ip_mgt: 192.168.2.62
   mac_mgt: 08:00:38:35:a4:1e
-edel-13:
+edel-13: 
   mac_eth0: 08:00:38:35:ab:dc
   ip_eth0: 172.16.16.63
   mac_eth1: 08:00:38:35:ab:dd
@@ -132,7 +145,8 @@ edel-13:
   ip_ib1: ""
   ip_mgt: 192.168.2.63
   mac_mgt: 08:00:38:35:a3:ee
-edel-14:
+  ib_guid: "0x080038000135c9cb"
+edel-14: 
   mac_eth0: 08:00:38:35:ab:ac
   ip_eth0: 172.16.16.64
   mac_eth1: 08:00:38:35:ab:ad
@@ -141,7 +155,7 @@ edel-14:
   ip_ib1: ""
   ip_mgt: 192.168.2.64
   mac_mgt: 08:00:38:35:a3:d6
-edel-15:
+edel-15: 
   mac_eth0: 08:00:38:35:ab:fc
   ip_eth0: 172.16.16.65
   mac_eth1: 08:00:38:35:ab:fd
@@ -150,7 +164,8 @@ edel-15:
   ip_ib1: ""
   ip_mgt: 192.168.2.65
   mac_mgt: 08:00:38:35:a3:fe
-edel-16:
+  ib_guid: "0x080038000135c9fb"
+edel-16: 
   mac_eth0: 08:00:38:35:ac:0c
   ip_eth0: 172.16.16.66
   mac_eth1: 08:00:38:35:ac:0d
@@ -159,7 +174,8 @@ edel-16:
   ip_ib1: ""
   ip_mgt: 192.168.2.66
   mac_mgt: 08:00:38:35:a4:06
-edel-17:
+  ib_guid: "0x080038000135ca13"
+edel-17: 
   mac_eth0: 08:00:38:35:ab:9e
   ip_eth0: 172.16.16.67
   mac_eth1: 08:00:38:35:ab:9f
@@ -168,7 +184,8 @@ edel-17:
   ip_ib1: ""
   ip_mgt: 192.168.2.67
   mac_mgt: 08:00:38:35:a3:cf
-edel-18:
+  ib_guid: "0x080038000135c96e"
+edel-18: 
   mac_eth0: 08:00:38:35:ab:82
   ip_eth0: 172.16.16.68
   mac_eth1: 08:00:38:35:ab:83
@@ -177,7 +194,7 @@ edel-18:
   ip_ib1: ""
   ip_mgt: 192.168.2.68
   mac_mgt: 08:00:38:35:a3:c1
-edel-19:
+edel-19: 
   mac_eth0: 08:00:38:35:ab:d0
   ip_eth0: 172.16.16.69
   mac_eth1: 08:00:38:35:ab:d1
@@ -186,7 +203,8 @@ edel-19:
   ip_ib1: ""
   ip_mgt: 192.168.2.69
   mac_mgt: 08:00:38:35:a3:e8
-edel-20:
+  ib_guid: "0x080038000135c9b9"
+edel-20: 
   mac_eth0: 08:00:38:35:ab:78
   ip_eth0: 172.16.16.70
   mac_eth1: 08:00:38:35:ab:79
@@ -195,7 +213,7 @@ edel-20:
   ip_ib1: ""
   ip_mgt: 192.168.2.70
   mac_mgt: 08:00:38:35:a3:bc
-edel-21:
+edel-21: 
   mac_eth0: 08:00:38:35:ac:4a
   ip_eth0: 172.16.16.71
   mac_eth1: 08:00:38:35:ac:4b
@@ -204,7 +222,7 @@ edel-21:
   ip_ib1: ""
   ip_mgt: 192.168.2.71
   mac_mgt: 08:00:38:35:a4:25
-edel-22:
+edel-22: 
   mac_eth0: 08:00:38:35:ab:9c
   ip_eth0: 172.16.16.72
   mac_eth1: 08:00:38:35:ab:9d
@@ -213,7 +231,7 @@ edel-22:
   ip_ib1: ""
   ip_mgt: 192.168.2.72
   mac_mgt: 08:00:38:35:a3:ce
-edel-23:
+edel-23: 
   mac_eth0: 08:00:38:35:ab:d6
   ip_eth0: 172.16.16.73
   mac_eth1: 08:00:38:35:ab:d7
@@ -222,8 +240,9 @@ edel-23:
   ip_ib1: ""
   ip_mgt: 192.168.2.73
   mac_mgt: 08:00:38:35:a3:eb
-edel-24:
-  mac_eth0: 08:00:38:35:ac:26 
+  ib_guid: "0x080038000135c9c2"
+edel-24: 
+  mac_eth0: 08:00:38:35:ac:26
   ip_eth0: 172.16.16.74
   mac_eth1: 08:00:38:35:ac:27
   ip_eth1: ""
@@ -231,7 +250,7 @@ edel-24:
   ip_ib1: ""
   ip_mgt: 192.168.2.74
   mac_mgt: ""
-edel-25:
+edel-25: 
   mac_eth0: 08:00:38:35:aa:b8
   ip_eth0: 172.16.16.75
   mac_eth1: 08:00:38:35:aa:b9
@@ -240,7 +259,8 @@ edel-25:
   ip_ib1: ""
   ip_mgt: 192.168.2.75
   mac_mgt: 08:00:38:35:a3:5c
-edel-26:
+  ib_guid: "0x080038000135c815"
+edel-26: 
   mac_eth0: 08:00:38:35:ab:54
   ip_eth0: 172.16.16.76
   mac_eth1: 08:00:38:35:ab:55
@@ -249,7 +269,8 @@ edel-26:
   ip_ib1: ""
   ip_mgt: 192.168.2.76
   mac_mgt: ""
-edel-27:
+  ib_guid: "0x080038000135c8ff"
+edel-27: 
   mac_eth0: 08:00:38:35:ac:3e
   ip_eth0: 172.16.16.77
   mac_eth1: 08:00:38:35:ac:3f
@@ -258,7 +279,8 @@ edel-27:
   ip_ib1: ""
   ip_mgt: 192.168.2.77
   mac_mgt: 08:00:38:35:a4:1f
-edel-28:
+  ib_guid: "0x080038000135ca5e"
+edel-28: 
   mac_eth0: 08:00:38:35:ac:48
   ip_eth0: 172.16.16.78
   mac_eth1: 08:00:38:35:ac:49
@@ -267,7 +289,8 @@ edel-28:
   ip_ib1: ""
   ip_mgt: 192.168.2.78
   mac_mgt: 08:00:38:35:a4:24
-edel-29:
+  ib_guid: "0x080038000135ca6d"
+edel-29: 
   mac_eth0: 08:00:38:35:ab:be
   ip_eth0: 172.16.16.79
   mac_eth1: 08:00:38:35:ab:bf
@@ -276,7 +299,8 @@ edel-29:
   ip_ib1: ""
   ip_mgt: 192.168.2.79
   mac_mgt: 08:00:38:35:a3:df
-edel-30:
+  ib_guid: "0x080038000135c99e"
+edel-30: 
   mac_eth0: 08:00:38:35:ab:ba
   ip_eth0: 172.16.16.80
   mac_eth1: 08:00:38:35:ab:bb
@@ -285,7 +309,7 @@ edel-30:
   ip_ib1: ""
   ip_mgt: 192.168.2.80
   mac_mgt: 08:00:38:35:a3:dd
-edel-31:
+edel-31: 
   mac_eth0: 08:00:38:35:af:3e
   ip_eth0: 172.16.16.81
   mac_eth1: 08:00:38:35:af:3f
@@ -294,7 +318,7 @@ edel-31:
   ip_ib1: ""
   ip_mgt: 192.168.2.81
   mac_mgt: 08:00:38:35:a5:9f
-edel-32:
+edel-32: 
   mac_eth0: 08:00:38:35:ab:46
   ip_eth0: 172.16.16.82
   mac_eth1: 08:00:38:35:ab:47
@@ -303,7 +327,8 @@ edel-32:
   ip_ib1: ""
   ip_mgt: 192.168.2.82
   mac_mgt: 08:00:38:35:a3:a3
-edel-33:
+  ib_guid: "0x080038000135c8ea"
+edel-33: 
   mac_eth0: 08:00:38:35:ac:4c
   ip_eth0: 172.16.16.83
   mac_eth1: 08:00:38:35:ac:4d
@@ -312,7 +337,7 @@ edel-33:
   ip_ib1: ""
   ip_mgt: 192.168.2.83
   mac_mgt: 08:00:38:35:a4:26
-edel-34:
+edel-34: 
   mac_eth0: 08:00:38:35:ab:a2
   ip_eth0: 172.16.16.84
   mac_eth1: 08:00:38:35:ab:a3
@@ -321,7 +346,7 @@ edel-34:
   ip_ib1: ""
   ip_mgt: 192.168.2.84
   mac_mgt: 08:00:38:35:a3:d1
-edel-35:
+edel-35: 
   mac_eth0: 08:00:38:35:ab:62
   ip_eth0: 172.16.16.85
   mac_eth1: 08:00:38:35:ab:63
@@ -330,7 +355,8 @@ edel-35:
   ip_ib1: ""
   ip_mgt: 192.168.2.85
   mac_mgt: 08:00:38:35:a3:b1
-edel-36:
+  ib_guid: "0x080038000135c914"
+edel-36: 
   mac_eth0: 08:00:38:35:ab:e6
   ip_eth0: 172.16.16.86
   mac_eth1: 08:00:38:35:ab:e7
@@ -339,7 +365,7 @@ edel-36:
   ip_ib1: ""
   ip_mgt: 192.168.2.86
   mac_mgt: 08:00:38:35:a3:f3
-edel-37:
+edel-37: 
   mac_eth0: 08:00:38:35:aa:64
   ip_eth0: 172.16.16.87
   mac_eth1: 08:00:38:35:aa:65
@@ -348,7 +374,7 @@ edel-37:
   ip_ib1: ""
   ip_mgt: 192.168.2.87
   mac_mgt: 08:00:38:35:a3:32
-edel-38:
+edel-38: 
   mac_eth0: 08:00:38:35:ab:d2
   ip_eth0: 172.16.16.88
   mac_eth1: 08:00:38:35:ab:d3
@@ -357,7 +383,8 @@ edel-38:
   ip_ib1: ""
   ip_mgt: 192.168.2.88
   mac_mgt: 08:00:38:35:a3:e9
-edel-39:
+  ib_guid: "0x080038000135c9bc"
+edel-39: 
   mac_eth0: 08:00:38:35:ac:2a
   ip_eth0: 172.16.16.89
   mac_eth1: 08:00:38:35:ac:2b
@@ -366,7 +393,8 @@ edel-39:
   ip_ib1: ""
   ip_mgt: 192.168.2.89
   mac_mgt: 08:00:38:35:a4:15
-edel-3:
+  ib_guid: "0x080038000135ca40"
+edel-3: 
   mac_eth0: 08:00:38:35:ab:8c
   ip_eth0: 172.16.16.53
   mac_eth1: 08:00:38:35:ab:8d
@@ -375,7 +403,7 @@ edel-3:
   ip_ib1: ""
   ip_mgt: 192.168.2.53
   mac_mgt: 08:00:38:35:a3:c6
-edel-40:
+edel-40: 
   mac_eth0: 08:00:38:35:ab:a8
   ip_eth0: 172.16.16.90
   mac_eth1: 08:00:38:35:ab:a9
@@ -384,7 +412,8 @@ edel-40:
   ip_ib1: ""
   ip_mgt: 192.168.2.90
   mac_mgt: 08:00:38:35:a3:d4
-edel-41:
+  ib_guid: "0x080038000135c97d"
+edel-41: 
   mac_eth0: 08:00:38:35:ac:36
   ip_eth0: 172.16.16.91
   mac_eth1: 08:00:38:35:ac:37
@@ -393,7 +422,7 @@ edel-41:
   ip_ib1: ""
   ip_mgt: 192.168.2.91
   mac_mgt: 08:00:38:35:a4:1b
-edel-42:
+edel-42: 
   mac_eth0: 08:00:38:35:ad:be
   ip_eth0: 172.16.16.92
   mac_eth1: ""
@@ -402,7 +431,8 @@ edel-42:
   ip_ib1: ""
   ip_mgt: 192.168.2.92
   mac_mgt: ""
-edel-43:
+  ib_guid: "0x08003800013729c5"
+edel-43: 
   mac_eth0: 08:00:38:35:ab:d4
   ip_eth0: 172.16.16.93
   mac_eth1: 08:00:38:35:ab:d5
@@ -411,7 +441,7 @@ edel-43:
   ip_ib1: ""
   ip_mgt: 192.168.2.93
   mac_mgt: 08:00:38:35:a3:ea
-edel-44:
+edel-44: 
   mac_eth0: 08:00:38:35:ab:aa
   ip_eth0: 172.16.16.94
   mac_eth1: 08:00:38:35:ab:ab
@@ -420,7 +450,8 @@ edel-44:
   ip_ib1: ""
   ip_mgt: 192.168.2.94
   mac_mgt: 08:00:38:35:a3:d5
-edel-45:
+  ib_guid: "0x080038000135c980"
+edel-45: 
   mac_eth0: 08:00:38:35:ac:22
   ip_eth0: 172.16.16.95
   mac_eth1: 08:00:38:35:ac:23
@@ -429,7 +460,8 @@ edel-45:
   ip_ib1: ""
   ip_mgt: 192.168.2.95
   mac_mgt: 08:00:38:35:a4:11
-edel-46:
+  ib_guid: "0x080038000135ca34"
+edel-46: 
   mac_eth0: 08:00:38:35:ab:4a
   ip_eth0: 172.16.16.96
   mac_eth1: 08:00:38:35:ab:4b
@@ -438,7 +470,7 @@ edel-46:
   ip_ib1: ""
   ip_mgt: 192.168.2.96
   mac_mgt: 08:00:38:35:a3:a5
-edel-47:
+edel-47: 
   mac_eth0: 08:00:38:35:ab:bc
   ip_eth0: 172.16.16.97
   mac_eth1: 08:00:38:35:ab:bd
@@ -447,7 +479,8 @@ edel-47:
   ip_ib1: ""
   ip_mgt: 192.168.2.97
   mac_mgt: 08:00:38:35:a3:de
-edel-48:
+  ib_guid: "0x080038000135c99b"
+edel-48: 
   mac_eth0: 08:00:38:35:ab:70
   ip_eth0: 172.16.16.98
   mac_eth1: 08:00:38:35:ab:71
@@ -456,7 +489,8 @@ edel-48:
   ip_ib1: ""
   ip_mgt: 192.168.2.98
   mac_mgt: 08:00:38:35:a3:b8
-edel-49:
+  ib_guid: "0x080038000135c929"
+edel-49: 
   mac_eth0: 08:00:38:35:ab:b6
   ip_eth0: 172.16.16.99
   mac_eth1: 08:00:38:35:ab:b7
@@ -465,8 +499,9 @@ edel-49:
   ip_ib1: ""
   ip_mgt: 192.168.2.99
   mac_mgt: 08:00:38:35:a3:db
-edel-50:
-  mac_eth0: 08:00:38:35:ac:10 
+  ib_guid: "0x080038000135c992"
+edel-50: 
+  mac_eth0: 08:00:38:35:ac:10
   ip_eth0: 172.16.16.100
   mac_eth1: 08:00:38:35:ac:11
   ip_eth1: ""
@@ -474,7 +509,8 @@ edel-50:
   ip_ib1: ""
   ip_mgt: 172.16.18.100
   mac_mgt: ""
-edel-51:
+  ib_guid: "0x080038000135ca19"
+edel-51: 
   mac_eth0: 08:00:38:35:ac:40
   ip_eth0: 172.16.16.101
   mac_eth1: 08:00:38:35:ac:41
@@ -483,7 +519,8 @@ edel-51:
   ip_ib1: ""
   ip_mgt: 192.168.2.101
   mac_mgt: 08:00:38:35:a4:20
-edel-52:
+  ib_guid: "0x080038000135ca61"
+edel-52: 
   mac_eth0: 08:00:38:35:ac:1a
   ip_eth0: 172.16.16.102
   mac_eth1: 08:00:38:35:ac:1b
@@ -492,7 +529,8 @@ edel-52:
   ip_ib1: ""
   ip_mgt: 192.168.2.102
   mac_mgt: 08:00:38:35:a4:0d
-edel-53:
+  ib_guid: "0x080038000135ca28"
+edel-53: 
   mac_eth0: 08:00:38:35:ac:34
   ip_eth0: 172.16.16.103
   mac_eth1: 08:00:38:35:ac:35
@@ -501,7 +539,8 @@ edel-53:
   ip_ib1: ""
   ip_mgt: 192.168.2.103
   mac_mgt: 08:00:38:35:a4:1a
-edel-54:
+  ib_guid: "0x080038000135ca4f"
+edel-54: 
   mac_eth0: 08:00:38:35:ac:3a
   ip_eth0: 172.16.16.104
   mac_eth1: 08:00:38:35:ac:3b
@@ -510,7 +549,8 @@ edel-54:
   ip_ib1: ""
   ip_mgt: 192.168.2.104
   mac_mgt: 08:00:38:35:a4:1d
-edel-55:
+  ib_guid: "0x080038000135ca58"
+edel-55: 
   mac_eth0: 08:00:38:35:ab:e8
   ip_eth0: 172.16.16.105
   mac_eth1: 08:00:38:35:ab:e9
@@ -519,7 +559,8 @@ edel-55:
   ip_ib1: ""
   ip_mgt: 192.168.2.105
   mac_mgt: 08:00:38:35:a3:f4
-edel-56:
+  ib_guid: "0x080038000135c9dd"
+edel-56: 
   mac_eth0: 08:00:38:35:ac:00
   ip_eth0: 172.16.16.106
   mac_eth1: 08:00:38:35:ac:01
@@ -528,7 +569,8 @@ edel-56:
   ip_ib1: ""
   ip_mgt: 192.168.2.106
   mac_mgt: 08:00:38:35:a4:00
-edel-57:
+  ib_guid: "0x080038000135ca01"
+edel-57: 
   mac_eth0: 08:00:38:35:ab:ae
   ip_eth0: 172.16.16.107
   mac_eth1: 08:00:38:35:ab:af
@@ -537,7 +579,8 @@ edel-57:
   ip_ib1: ""
   ip_mgt: 192.168.2.107
   mac_mgt: 08:00:38:35:a3:d7
-edel-58:
+  ib_guid: "0x080038000135c986"
+edel-58: 
   mac_eth0: 08:00:38:35:ac:08
   ip_eth0: 172.16.16.108
   mac_eth1: 08:00:38:35:ac:09
@@ -546,7 +589,8 @@ edel-58:
   ip_ib1: ""
   ip_mgt: 192.168.2.108
   mac_mgt: 08:00:38:35:a4:04
-edel-59:
+  ib_guid: "0x080038000135ca0d"
+edel-59: 
   mac_eth0: 08:00:38:35:ab:5a
   ip_eth0: 172.16.16.109
   mac_eth1: 08:00:38:35:ab:5b
@@ -555,7 +599,8 @@ edel-59:
   ip_ib1: ""
   ip_mgt: 192.168.2.109
   mac_mgt: 08:00:38:35:a3:ad
-edel-5:
+  ib_guid: "0x080038000135c908"
+edel-5: 
   mac_eth0: 08:00:38:35:ab:92
   ip_eth0: 172.16.16.55
   mac_eth1: 08:00:38:35:ab:93
@@ -564,7 +609,7 @@ edel-5:
   ip_ib1: ""
   ip_mgt: 192.168.2.55
   mac_mgt: 08:00:38:35:a3:c9
-edel-60:
+edel-60: 
   mac_eth0: 08:00:38:35:ac:24
   ip_eth0: 172.16.16.110
   mac_eth1: 08:00:38:35:ac:25
@@ -573,7 +618,8 @@ edel-60:
   ip_ib1: ""
   ip_mgt: 192.168.2.110
   mac_mgt: 08:00:38:35:a4:12
-edel-61:
+  ib_guid: "0x080038000135ca37"
+edel-61: 
   mac_eth0: 08:00:38:35:ab:5c
   ip_eth0: 172.16.16.111
   mac_eth1: 08:00:38:35:ab:5d
@@ -582,7 +628,8 @@ edel-61:
   ip_ib1: ""
   ip_mgt: 192.168.2.111
   mac_mgt: 08:00:38:35:a3:ae
-edel-62:
+  ib_guid: "0x080038000135c90b"
+edel-62: 
   mac_eth0: 08:00:38:35:ab:da
   ip_eth0: 172.16.16.112
   mac_eth1: 08:00:38:35:ab:db
@@ -591,7 +638,8 @@ edel-62:
   ip_ib1: ""
   ip_mgt: 192.168.2.112
   mac_mgt: 08:00:38:35:a3:ed
-edel-63:
+  ib_guid: "0x080038000135c9c8"
+edel-63: 
   mac_eth0: 08:00:38:35:ab:b2
   ip_eth0: 172.16.16.113
   mac_eth1: 08:00:38:35:ab:b3
@@ -600,7 +648,8 @@ edel-63:
   ip_ib1: ""
   ip_mgt: 192.168.2.113
   mac_mgt: 08:00:38:35:a3:d9
-edel-64:
+  ib_guid: "0x080038000135c98c"
+edel-64: 
   mac_eth0: 08:00:38:35:aa:20
   ip_eth0: 172.16.16.114
   mac_eth1: 08:00:38:35:aa:21
@@ -609,7 +658,8 @@ edel-64:
   ip_ib1: ""
   ip_mgt: 192.168.2.114
   mac_mgt: 08:00:38:35:a3:10
-edel-65:
+  ib_guid: "0x080038000135cc9e"
+edel-65: 
   mac_eth0: 08:00:38:35:ab:e4
   ip_eth0: 172.16.16.115
   mac_eth1: 08:00:38:35:ab:e5
@@ -618,7 +668,8 @@ edel-65:
   ip_ib1: ""
   ip_mgt: 192.168.2.115
   mac_mgt: ""
-edel-66:
+  ib_guid: "0x080038000135c9d7"
+edel-66: 
   mac_eth0: 08:00:38:35:ac:14
   ip_eth0: 172.16.16.116
   mac_eth1: 08:00:38:35:ac:15
@@ -627,7 +678,8 @@ edel-66:
   ip_ib1: ""
   ip_mgt: 192.168.2.116
   mac_mgt: 08:00:38:35:a4:0a
-edel-67:
+  ib_guid: "0x080038000135ca1f"
+edel-67: 
   mac_eth0: 08:00:38:35:ab:fa
   ip_eth0: 172.16.16.117
   mac_eth1: 08:00:38:35:ab:fb
@@ -636,7 +688,8 @@ edel-67:
   ip_ib1: ""
   ip_mgt: 192.168.2.117
   mac_mgt: 08:00:38:35:a3:fd
-edel-68:
+  ib_guid: "0x080038000135c9f8"
+edel-68: 
   mac_eth0: 08:00:38:35:ab:b0
   ip_eth0: 172.16.16.118
   mac_eth1: 08:00:38:35:ab:b1
@@ -645,7 +698,8 @@ edel-68:
   ip_ib1: ""
   ip_mgt: 192.168.2.118
   mac_mgt: 08:00:38:35:a3:d8
-edel-69:
+  ib_guid: "0x080038000135c989"
+edel-69: 
   mac_eth0: 08:00:38:35:ac:68
   ip_eth0: 172.16.16.119
   mac_eth1: 08:00:38:35:ac:69
@@ -654,7 +708,8 @@ edel-69:
   ip_ib1: ""
   ip_mgt: 192.168.2.119
   mac_mgt: ""
-edel-6:
+  ib_guid: "0x080038000135ca9d"
+edel-6: 
   mac_eth0: 08:00:38:35:ac:54
   ip_eth0: 172.16.16.56
   mac_eth1: 08:00:38:35:ac:55
@@ -663,7 +718,8 @@ edel-6:
   ip_ib1: ""
   ip_mgt: 192.168.2.56
   mac_mgt: 08:00:38:35:a4:2a
-edel-70:
+  ib_guid: "0x080038000135ca7f"
+edel-70: 
   mac_eth0: 08:00:38:35:ac:66
   ip_eth0: 172.16.16.120
   mac_eth1: 08:00:38:35:ac:67
@@ -672,7 +728,8 @@ edel-70:
   ip_ib1: ""
   ip_mgt: 192.168.2.120
   mac_mgt: 08:00:38:35:a4:33
-edel-71:
+  ib_guid: "0x080038000135ca9a"
+edel-71: 
   mac_eth0: 08:00:38:35:ab:66
   ip_eth0: 172.16.16.121
   mac_eth1: 08:00:38:35:ab:67
@@ -681,7 +738,8 @@ edel-71:
   ip_ib1: ""
   ip_mgt: 192.168.2.121
   mac_mgt: ""
-edel-72:
+  ib_guid: "0x080038000135c91a"
+edel-72: 
   mac_eth0: 08:00:38:35:ab:50
   ip_eth0: 172.16.16.122
   mac_eth1: 08:00:38:35:ab:51
@@ -690,7 +748,7 @@ edel-72:
   ip_ib1: ""
   ip_mgt: 192.168.2.122
   mac_mgt: 08:00:38:35:a3:a8
-edel-7:
+edel-7: 
   mac_eth0: 08:00:38:35:ab:40
   ip_eth0: 172.16.16.57
   mac_eth1: 08:00:38:35:ab:41
@@ -699,7 +757,8 @@ edel-7:
   ip_ib1: ""
   ip_mgt: 192.168.2.57
   mac_mgt: 08:00:38:35:a3:a0
-edel-8:
+  ib_guid: "0x080038000135c8e1"
+edel-8: 
   mac_eth0: 08:00:38:35:ab:56
   ip_eth0: 172.16.16.58
   mac_eth1: 08:00:38:35:ab:57
@@ -708,7 +767,8 @@ edel-8:
   ip_ib1: ""
   ip_mgt: 192.168.2.58
   mac_mgt: 08:00:38:35:a3:ab
-edel-9:
+  ib_guid: "0x080038000135c902"
+edel-9: 
   mac_eth0: 08:00:38:35:ab:d8
   ip_eth0: 172.16.16.59
   mac_eth1: 08:00:38:35:ab:d9
@@ -717,7 +777,8 @@ edel-9:
   ip_ib1: ""
   ip_mgt: 192.168.2.59
   mac_mgt: 08:00:38:35:a3:ec
-genepi-10:
+  ib_guid: "0x080038000135c9c5"
+genepi-10: 
   mac_eth0: 00:30:48:7f:41:fc
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:41:fd
@@ -726,7 +787,7 @@ genepi-10:
   ip_ib1: ""
   ip_mgt: 192.168.1.110
   mac_mgt: 00:30:48:96:d4:2d
-genepi-11:
+genepi-11: 
   mac_eth0: 00:30:48:7f:42:06
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:42:07
@@ -735,7 +796,8 @@ genepi-11:
   ip_ib1: ""
   ip_mgt: 192.168.1.111
   mac_mgt: 00:30:48:96:d6:90
-genepi-12:
+  ib_guid: 0x0002c90300015431,0x0002c90300015432
+genepi-12: 
   mac_eth0: 00:30:48:7e:a3:d4
   ip_eth0: ""
   mac_eth1: 00:30:48:7e:a3:d5
@@ -744,7 +806,8 @@ genepi-12:
   ip_ib1: ""
   ip_mgt: 192.168.1.112
   mac_mgt: ""
-genepi-13:
+  ib_guid: 0x0002c903000159a1,0x0002c903000159a2
+genepi-13: 
   mac_eth0: 00:30:48:7f:3e:c6
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:3e:c7
@@ -753,7 +816,8 @@ genepi-13:
   ip_ib1: ""
   ip_mgt: 192.168.1.113
   mac_mgt: 00:30:48:96:d4:9a
-genepi-14:
+  ib_guid: 0x0002c903000155c9,0x0002c903000155ca
+genepi-14: 
   mac_eth0: 00:30:48:7f:41:f2
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:41:f3
@@ -762,7 +826,8 @@ genepi-14:
   ip_ib1: ""
   ip_mgt: 192.168.1.114
   mac_mgt: 00:30:48:96:d3:40
-genepi-15:
+  ib_guid: 0x0002c903000155cd,0x0002c903000155ce
+genepi-15: 
   mac_eth0: 00:30:48:7f:3e:f2
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:3e:f3
@@ -771,7 +836,8 @@ genepi-15:
   ip_ib1: ""
   ip_mgt: 192.168.1.115
   mac_mgt: 00:30:48:96:d3:2f
-genepi-16:
+  ib_guid: 0x0002c903000155d9,0x0002c903000155da
+genepi-16: 
   mac_eth0: 00:30:48:7f:3e:b8
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:3e:b9
@@ -780,7 +846,8 @@ genepi-16:
   ip_ib1: ""
   ip_mgt: 192.168.1.116
   mac_mgt: 00:30:48:96:d4:37
-genepi-17:
+  ib_guid: 0x0002c903000155e9,0x0002c903000155ea
+genepi-17: 
   mac_eth0: 00:30:48:7f:8a:8c
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:8a:8d
@@ -789,7 +856,8 @@ genepi-17:
   ip_ib1: ""
   ip_mgt: 192.168.1.117
   mac_mgt: 00:30:48:96:d2:42
-genepi-18:
+  ib_guid: 0x0002c903000155e1,0x0002c903000155e2
+genepi-18: 
   mac_eth0: 00:30:48:7f:85:fa
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:85:fb
@@ -798,7 +866,8 @@ genepi-18:
   ip_ib1: ""
   ip_mgt: 192.168.1.118
   mac_mgt: 00:30:48:96:d3:4d
-genepi-19:
+  ib_guid: 0x0002c903000155d5,0x0002c903000155d6
+genepi-19: 
   mac_eth0: 00:30:48:7f:8a:8a
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:8a:8b
@@ -807,7 +876,8 @@ genepi-19:
   ip_ib1: ""
   ip_mgt: 192.168.1.119
   mac_mgt: 00:30:48:96:d1:f5
-genepi-1:
+  ib_guid: 0x0002c9030001565d,0x0002c9030001565e
+genepi-1: 
   mac_eth0: 00:30:48:7f:85:be
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:85:bf
@@ -816,7 +886,7 @@ genepi-1:
   ip_ib1: ""
   ip_mgt: 192.168.1.101
   mac_mgt: 00:30:48:96:d6:b5
-genepi-20:
+genepi-20: 
   mac_eth0: 00:30:48:7f:8a:86
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:8a:87
@@ -825,7 +895,8 @@ genepi-20:
   ip_ib1: ""
   ip_mgt: 192.168.1.120
   mac_mgt: 00:30:48:96:d3:bf
-genepi-21:
+  ib_guid: 0x0002c903000155e5,0x0002c903000155e6
+genepi-21: 
   mac_eth0: 00:30:48:7f:3e:f0
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:3e:f1
@@ -834,7 +905,8 @@ genepi-21:
   ip_ib1: ""
   ip_mgt: 192.168.1.121
   mac_mgt: 00:30:48:96:d3:56
-genepi-22:
+  ib_guid: 0x0002c903000155d1,0x0002c903000155d2
+genepi-22: 
   mac_eth0: 00:30:48:7f:41:f4
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:41:f5
@@ -843,7 +915,8 @@ genepi-22:
   ip_ib1: ""
   ip_mgt: 192.168.1.122
   mac_mgt: ""
-genepi-23:
+  ib_guid: 0x0002c903000155c1,0x0002c903000155c2
+genepi-23: 
   mac_eth0: 00:30:48:7f:29:dc
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:dd
@@ -852,7 +925,8 @@ genepi-23:
   ip_ib1: ""
   ip_mgt: 192.168.1.123
   mac_mgt: 00:30:48:96:d2:d1
-genepi-24:
+  ib_guid: 0x0002c90300015631,0x0002c90300015632
+genepi-24: 
   mac_eth0: 00:30:48:7f:29:de
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:df
@@ -861,7 +935,8 @@ genepi-24:
   ip_ib1: ""
   ip_mgt: 192.168.1.124
   mac_mgt: 00:30:48:96:d6:ff
-genepi-25:
+  ib_guid: 0x0002c90300015b01,0x0002c90300015b02
+genepi-25: 
   mac_eth0: 00:30:48:7f:41:5a
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:41:5b
@@ -870,7 +945,7 @@ genepi-25:
   ip_ib1: ""
   ip_mgt: 192.168.1.125
   mac_mgt: 00:30:48:96:d3:2d
-genepi-26:
+genepi-26: 
   mac_eth0: 00:30:48:7f:41:5c
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:41:5d
@@ -879,7 +954,7 @@ genepi-26:
   ip_ib1: ""
   ip_mgt: 192.168.1.126
   mac_mgt: 00:30:48:96:d6:08
-genepi-27:
+genepi-27: 
   mac_eth0: 00:30:48:7f:41:4e
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:41:4f
@@ -888,7 +963,8 @@ genepi-27:
   ip_ib1: ""
   ip_mgt: 192.168.1.127
   mac_mgt: 00:30:48:96:d3:1f
-genepi-28:
+  ib_guid: 0x0002c90300015731,0x0002c90300015732
+genepi-28: 
   mac_eth0: 00:30:48:7f:41:5e
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:41:5f
@@ -897,7 +973,8 @@ genepi-28:
   ip_ib1: ""
   ip_mgt: 192.168.1.128
   mac_mgt: ""
-genepi-29:
+  ib_guid: 0x0002c90300015659,0x0002c9030001565a
+genepi-29: 
   mac_eth0: 00:30:48:7f:29:ec
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:ed
@@ -906,7 +983,8 @@ genepi-29:
   ip_ib1: ""
   ip_mgt: 192.168.1.129
   mac_mgt: 00:30:48:96:d2:db
-genepi-2:
+  ib_guid: 0x0002c903000155b5,0x0002c903000155b6
+genepi-2: 
   mac_eth0: 00:30:48:7f:91:62
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:91:63
@@ -915,7 +993,8 @@ genepi-2:
   ip_ib1: ""
   ip_mgt: 192.168.1.102
   mac_mgt: 00:30:48:96:d1:e2
-genepi-30:
+  ib_guid: 0x0002c903000158d5,0x0002c903000158d6
+genepi-30: 
   mac_eth0: 00:30:48:7f:29:da
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:db
@@ -924,16 +1003,17 @@ genepi-30:
   ip_ib1: ""
   ip_mgt: 192.168.1.130
   mac_mgt: 00:30:48:96:d4:2f
-genepi-31:
+  ib_guid: 0x0002c90300015661,0x0002c90300015662
+genepi-31: 
   mac_eth0: ""
   ip_eth0: ""
-  mac_eth1: 00:30:48:7F:41:57 
+  mac_eth1: 00:30:48:7F:41:57
   ip_eth1: 172.16.16.31
   ip_ib0: ""
   ip_ib1: ""
   ip_mgt: 192.168.1.131
   mac_mgt: ""
-genepi-32:
+genepi-32: 
   mac_eth0: 00:30:48:7f:41:50
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:41:51
@@ -942,7 +1022,8 @@ genepi-32:
   ip_ib1: ""
   ip_mgt: 192.168.1.132
   mac_mgt: 00:30:48:96:d7:84
-genepi-33:
+  ib_guid: 0x0002c903000155ed,0x0002c903000155ee
+genepi-33: 
   mac_eth0: 00:30:48:7f:29:ee
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:ef
@@ -951,7 +1032,8 @@ genepi-33:
   ip_ib1: ""
   ip_mgt: 192.168.1.133
   mac_mgt: 00:30:48:96:d2:dc
-genepi-34:
+  ib_guid: 0x0002c90300015805,0x0002c90300015806
+genepi-34: 
   mac_eth0: 00:30:48:7f:29:40
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:41
@@ -960,7 +1042,8 @@ genepi-34:
   ip_ib1: ""
   ip_mgt: 192.168.1.134
   mac_mgt: 00:30:48:96:d2:dd
-genepi-3:
+  ib_guid: 0x0002c90300015655,0x0002c90300015656
+genepi-3: 
   mac_eth0: 00:30:48:7f:3f:0a
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:3f:0b
@@ -969,8 +1052,8 @@ genepi-3:
   ip_ib1: ""
   ip_mgt: 192.168.1.103
   mac_mgt: 00:30:48:96:d3:44
-genepi-4:
-  mac_eth0: 00:30:48:7f:44:8c 
+genepi-4: 
+  mac_eth0: 00:30:48:7f:44:8c
   ip_eth0: ""
   mac_eth1: 00:30:48:7F:44:8D
   ip_eth1: 172.16.16.4
@@ -978,7 +1061,8 @@ genepi-4:
   ip_ib1: ""
   ip_mgt: 192.168.1.104
   mac_mgt: ""
-genepi-5:
+  ib_guid: 0x0002c903000158bd,0x0002c903000158be
+genepi-5: 
   mac_eth0: 00:30:48:c1:b4:a6
   ip_eth0: ""
   mac_eth1: 00:30:48:c1:b4:a7
@@ -987,7 +1071,8 @@ genepi-5:
   ip_ib1: ""
   ip_mgt: 192.168.1.105
   mac_mgt: ""
-genepi-6:
+  ib_guid: 0x0002c90300015b0d,0x0002c90300015b0e
+genepi-6: 
   mac_eth0: ""
   ip_eth0: ""
   mac_eth1: 00:30:48:7F:29:F3
@@ -996,7 +1081,7 @@ genepi-6:
   ip_ib1: ""
   ip_mgt: 192.168.1.106
   mac_mgt: ""
-genepi-7:
+genepi-7: 
   mac_eth0: 00:30:48:7f:29:e0
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:e1
@@ -1005,7 +1090,8 @@ genepi-7:
   ip_ib1: ""
   ip_mgt: 192.168.1.107
   mac_mgt: 00:30:48:96:d1:d2
-genepi-8:
+  ib_guid: 0x0002c903000159ad,0x0002c903000159ae
+genepi-8: 
   mac_eth0: 00:30:48:7f:29:e2
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:29:e3
@@ -1014,7 +1100,8 @@ genepi-8:
   ip_ib1: ""
   ip_mgt: 192.168.1.108
   mac_mgt: 00:30:48:96:d6:94
-genepi-9:
+  ib_guid: 0x0002c90300015b19,0x0002c90300015b1a
+genepi-9: 
   mac_eth0: 00:30:48:7f:3e:ea
   ip_eth0: ""
   mac_eth1: 00:30:48:7f:3e:eb
@@ -1023,3 +1110,4 @@ genepi-9:
   ip_ib1: ""
   ip_mgt: 192.168.1.109
   mac_mgt: 00:30:48:96:d4:8e
+  ib_guid: 0x0002c90300015b15,0x0002c90300015b16