diff --git a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
index 8eec5c9011ae2915f6977f6cbc8acac3241cd295..2a55537a3cef542589fb741608759317d38cb80b 100644
--- a/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
+++ b/data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json
@@ -5,9 +5,9 @@
     "smt_size": 12
   },
   "bios": {
-    "release_date": "05/10/2012",
+    "release_date": "01/22/2016",
     "vendor": "Dell Inc.",
-    "version": "1.2.6"
+    "version": 2.5
   },
   "chassis": {
     "manufacturer": "Dell Inc.",
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
index 34dc2a412901ca2cc6261345a49837535137c406..ab1ffe54a412d7a257ce539ad8be8608278db128 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-1.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
index f54cd83043b6cf4b77408523c37ced3b3e1b7efa..24e86392e626bcab82c51375608db87d8196556e 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-10.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
index 49a89d1ca75135c72b4d405212f8cef6d09eb177..b356ff4369d553d22fb3c860762e17691b83a573 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-11.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
index a0a1b592a9ef6946ff848435152da8f84872cc42..bc5bc8e95870ef9ccb1ecc633b2e8ec250742d76 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-12.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
index 2b59f2da93e715af5595d00c7e70c0e4867b8cd0..1491a9a55bd4a24b48760c6cf67aa85ffe91e1dd 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-13.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
index df3e3f60f5ec9fb8caad3c28f7e1e74aea21fa81..15607b9520292b89b110548feced60daf44a6fc0 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-14.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
index 21bf56ef76afcb89a6eacb5c2d5519c07474ecef..f6269b44e9e1ce52b6adf9812feb8bfbe36037b7 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-15.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
index c62aa4ab57ece4289babf755f761f162f59cd5df..f1edb16709ce0f542a58606b7a53adc8eddcca93 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-16.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
index bba6f59d790f7ab18c37fb1b4dbaa7887a6fc11d..f97075875f1f763810654e29746757d571e3bb5e 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-2.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
index ebc2720f578474c59a1cd923628366da9b22cfe1..c46a6486da98a614e8b4fcca1603c55c2a7eaece 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-3.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
index c9a0d375a67a8d2043d924ed685a3f577ba31b5e..46da77368c362ecab5550d2e0253ce6066cceef1 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-4.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
index 7b268b06695040980636c63665c23ad8b8070a85..6d0507a05ee6b24c1fa22f655c0e81d1ba627e8a 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-5.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
index c3ec82be82b3cf57144f58c2f33d26c3219d2281..15bda14e2263a0cab53699dfbb4f4da744aa4db2 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-6.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
index d9798ec4b174d38ce876c8bfa0b2469a8ab98b68..2d665e4d29471a14c36682430ee416155ce8299f 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-7.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
index 80744600bb90a2c5ffcf919d22df17a8679a38c3..e40e0cbce25d63b3af0e0122bd2871498b22ea1e 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-8.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
index d552705fd576da5f192dfd95b34953e2a3eb77a5..bd015887d62ee12a2c317d9c9450b46071f0709e 100644
--- a/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
+++ b/data/grid5000/sites/nancy/clusters/graoully/nodes/graoully-9.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
index 8175118728322f4a6497f31c8b2f1bc711ea1bfe..4b5b561c5b8181004f3446dd146d78d84c18f76b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
@@ -64,15 +64,13 @@
       "bridged": false,
       "device": "eth2",
       "driver": "myri10ge",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "mac": "00:60:dd:46:84:b7",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffon1",
-      "switch_port": "Ten-GigabitEthernet1/1/1",
       "vendor": "myrinet",
       "version": "Myri-10G"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
index eba6a589be830f25e88d2b17785472293ba0cbc8..9a2f65af0fef931e860003fd68fa3e0013046d7e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
@@ -64,15 +64,13 @@
       "bridged": false,
       "device": "eth2",
       "driver": "myri10ge",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "mac": "00:60:dd:46:84:b9",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": "sgriffon1",
-      "switch_port": "Ten-GigabitEthernet1/2/2",
       "vendor": "myrinet",
       "version": "Myri-10G"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
index 221e340bc697960bc50f16db259678936ebc9812..9d024351fa7619f95abf3344e0a283dca972da9e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
@@ -64,15 +64,13 @@
       "bridged": false,
       "device": "eth2",
       "driver": "myri10ge",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "mac": "00:60:dd:46:84:a8",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "myrinet",
       "version": "Myri-10G"
     },
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
index 542dc77ca441bbf78c0efab0f3b7d9f958d61298..b5f72e6e665893ed3e5dc5088fa618c53744df28 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
@@ -64,15 +64,13 @@
       "bridged": false,
       "device": "eth2",
       "driver": "myri10ge",
-      "enabled": true,
+      "enabled": false,
       "interface": "Ethernet",
       "mac": "00:60:dd:46:84:b8",
       "management": false,
-      "mountable": true,
+      "mountable": false,
       "mounted": false,
       "rate": 10000000000,
-      "switch": null,
-      "switch_port": null,
       "vendor": "myrinet",
       "version": "Myri-10G"
     },
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
index 214e3d4376286ba9492d76614fc34a784869373b..0dea6f080f2dfec57f21823bc928ca11726fb8d6 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-1.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
index d4d55aeed913b267165e85f6d82080102dc6818e..d084fc8813b232039f8d61efa183ed9216f30650 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-2.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
index 8deeb56326bab935ce08cb46b7389eeff0d9afe8..cc20208eb10cebab91cb525c4a2f5fe1a5ad752f 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-3.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
index 8117a29bdf0c4f84038fa6ba45f7254774554cae..54ab2c4755f75f7fe2cf1042262cbc4796e5f74d 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-4.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
index c2bf1d1bb24104d8af3807b1863005acf8bbc80a..8c55f8bf9dd925b82a43962e8f0101cbfd7a835f 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-5.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
index 9e6165f7ba19bef238365bb2b7cbad20a766ab03..d71802c65a90c0794e4d8c658c3b764015c3270c 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-6.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
index 4d6cd0936f42e49b5efe0d9447ec02d4d0dea17c..caab67383efe18372eaf15786db61f7eb534b37a 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-7.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
index 6c3217679918635647172504bc4f3e04c47247da..d5001b7ef28b6ad3b4ba21a269e6692e902f95d0 100644
--- a/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
+++ b/data/grid5000/sites/nancy/clusters/grimoire/nodes/grimoire-8.json
@@ -124,7 +124,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "ib0",
       "driver": "mlx4_core",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
index 701fff7783889fef790af54d4542ed075ba9e575..8192e2f09cd5f4525be676c018260f4cd375823d 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-1.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
index b93892477d450f7812d5b20c3378f70d3bd99286..070c8dfb3e8909a5ff675b404b05fc700c9f5bc8 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-10.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
index f1ec48aa01d98f8aaf9b8ae39dc7d4281d051cd8..aeaff0ec93f32a1511080a37fa61b9b3001af4f2 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-11.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
index c13a48864cfa5b5e68e56a85b58b6f23a2e71410..1525a9a1628d69858c1475a6f6215989189f3891 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-12.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
index 2e40e689f8a60ad46644a8dfde754f4ceabd7144..1488f80a3b35a54140f82dcd5604e4cd9dd3d839 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-13.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
index 63b5fde9df3d6417e043ce4799c36f57371ad4db..a67e3de89a8633f7c501023ccc53396e3f697c1c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-14.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
index 1fbc2639e6d2283e2d863aa2d97d984ae5b38006..4cac61e29c436f493c35f7a65620134e4486bbd9 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-15.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
index 1a7c5320398c2530b6596b4187c84665fcdcd640..775746237294a6fb4465c62f7a248730faf84041 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-16.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
index 5d6331e6c84d17f0b45f98f4d94979a5e5afaee4..c30342713febf3df2e5a31fb4d925a25997d8155 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-17.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
index d1b533f07cda43074d6dabaacb8f498a649c329a..adda8d1d6a85e208573fa78eaff8c5a5f08b01f7 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-18.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
index 162ac35054516376b5e694958f6729434a2ea404..e6e9fa4abce0466dfddd5c1538adbee5f36dd280 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-19.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
index 74acb31d03544eb55cb0add9f6b319effb7ffd92..e1c1914eef77cedd38d77b6b526cee0620a58d7d 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-2.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
index a079bf95389fac90f3a7968ba801249212c85640..8c18ca7b1b61ae52be4a9239da293a598bf3c0b4 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-20.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
index ba50b364b44436f45a202efd6cc3b8fdc2edb150..9fc83dc5e2cae284fdb3d30f41d8eec48afa3a8d 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-21.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
index 65d93d5b4b70379922370151120625768dc97385..d983ce9dada52ebc15e976c3f1724cae963e75e6 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-22.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
index 1180b9092a8cf88ef61c4f17fbfa5932e4132910..f1086250e95cba564069777b02d3d5597a8a09e1 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-23.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
index 7bdd9cc492865029414cf9138b8ddbf8ba9533a3..342b2a5c68ef9ecb60bb64bd39d3e73f9002aedb 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-24.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
index b6ca05ff2c07bd3bb9fb9f479041bc9cd1c9d431..9ed49d8dbf4ae24db967fc003f23a170a9b96059 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-25.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
index a1a705a06899cb5934e76638491a7d179cddac65..002c366746785187ae009e43e1c91e6e5669d02e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-26.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
index d6c3ca059c6f73481fe06cb084fa33cd66f0f4fb..a6574908f301fd1f467ce0738b921667b9d06ef3 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-27.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
index 6d6df44317eb4ecaab0b4510eff6e1e101fff129..2c0c33af16b8250eaf242136bb9a4dfb7f1757d4 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-28.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
index 3841d0423510ce3a6954c5eb18abf1b04da30532..78e78499489e0f0af29b7dbd99dc8d39ce4edefb 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-29.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
index d715f8bce74deb325481d71e942dad7f7e384db4..3e701adbe92c6974e53126fa82bd9e09e32378b7 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-3.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
index 33bbcec7c79d2cdfed27d31bc0747a8240638fd7..e23a5a608073d924009e7d3e6e598b0524ea9cf4 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-30.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
index 29dd5461d8f65f9b6d7302ea6c5b631d27df2036..9dd1d407af4a8ec51135fef4df0583a6968f38ad 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-31.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
index b334a85138b6b87697dcce269bf60fc0e6810aeb..ae0e0635377e21428251e4a4bb9cfb4cf6a15013 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-32.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
index 6976b6fbd9ec9e9435edb46f9a867d9f7c04bec5..772089e5e263d7f121a2e3a63806b40930419f0a 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-33.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
index 3b552115fc6fdf712cea8485c66c4b8068437e79..029668d00675d83dfaa3b4308daa377a02ab8271 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-34.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
index e2f3d39f961384747e95c77aa58ca17e5f802d83..83e2690e5f30631cd7e72ca49155cbe188c958a7 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-35.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
index 680030ad000c0d1b43fd2568b4a67ee8c2977d37..47a69c5833b084d316e4af978b3ad2857801a9df 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-36.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
index 7d2d6a5c4a641218daeaf031fa589d84f0596db4..c7ace7b9057bfb8fa06542db5ec3dd1c8c981822 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-37.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
index e35c3cdcab172e97ba65f1dedbcb856d3b1e09cb..66799a324a29e573578024195d41f7e09f04bd39 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-38.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
index d115a8c91025b65e0465ccc7fbe1a5dc9f68dceb..78bd2f1f0d0d64bb2833c3b0ba47e34be87b71aa 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-39.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
index 20d4b1833faf3f0c12ae2083771c09042cb4c70c..3f322e0fa09244f526273710da94122f19acad36 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-4.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
index 7b675a99117214a3ac110a9f1b9c508582507dbb..e562250c374e0b33438352e40f3845d0f9fecb8b 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-40.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
index 85c61649a216b127f8e4eb60df1e3a501492ea63..eead68dad9a98c05187b85a6da27970d5df89ff5 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-5.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
index 29bb35dd8d2ab3edb6cb911c3083e86adfbc30f3..a7e2be931ff03a31f1ee6230704f21cf862da55e 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-50.json
@@ -104,7 +104,7 @@
       "rate": 1000000000
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ib_ipoib",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
index bd27058a84921d3f947769b835147d785e891c0f..476d6274414ac427ef681a03b559f5e35a18a22c 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-51.json
@@ -104,7 +104,7 @@
       "rate": 1000000000
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ib_ipoib",
       "enabled": true,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
index d898b8a0478c5fb6740882c7e1665878f26c2e07..719574fdad16612fec572447f2a7a5a094bdc10f 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-6.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
index f93f41e5a77fbd9ddbc85849d101711645cc8cbb..cf028fdd39dc475c79804e10014394e3d0367227 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-7.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
index 4dcbd279325a030920ad24d964afb7a36fe08c5d..25e4fcc2f52925cbf71a50963fa37b6abad15a52 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-8.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
index ab74e14843b364f91ee9fe065466cbf217ff45f9..9ffe61301239da7abbe842002e7f16a5744eafbb 100644
--- a/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
+++ b/data/grid5000/sites/nancy/clusters/grisou/nodes/grisou-9.json
@@ -44,7 +44,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth1",
       "driver": "ixgbe",
       "enabled": false,
@@ -60,7 +60,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth2",
       "driver": "ixgbe",
       "enabled": false,
@@ -76,7 +76,7 @@
       "vendor": "Intel Corporation"
     },
     {
-      "bridged": true,
+      "bridged": false,
       "device": "eth3",
       "driver": "ixgbe",
       "enabled": false,
diff --git a/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
new file mode 100644
index 0000000000000000000000000000000000000000..ac91a2f9271628ea420e7e8956fb58f8db7dddbc
--- /dev/null
+++ b/data/grid5000/sites/nancy/network_equipments/sgraoullyib.json
@@ -0,0 +1,108 @@
+{
+  "backplane_bps": null,
+  "channels": {
+    "naming_pattern": "Po%CHANNELID%"
+  },
+  "kind": "switch",
+  "linecards": [
+    {
+
+    },
+    {
+
+    },
+    {
+
+    },
+    {
+
+    },
+    {
+
+    },
+    {
+
+    },
+    {
+
+    },
+    {
+
+    },
+    {
+
+    },
+    {
+
+    },
+    {
+
+    },
+    {
+
+    },
+    {
+      "kind": "switch",
+      "naming_pattern": "%LINECARD%/%PORT%",
+      "ports": [
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+
+        },
+        {
+          "kind": "switch",
+          "uid": "sgriffonib"
+        }
+      ],
+      "rate": 20000000000,
+      "snmp_pattern": "%LINECARD%/%PORT%"
+    }
+  ],
+  "model": "Infiniband",
+  "mtu": null,
+  "routes": {
+
+  },
+  "site": "nancy",
+  "snmp_community": "public",
+  "type": "network_equipment",
+  "uid": "sgraoullyib",
+  "vlans": {
+    "naming_pattern": "Vlan%VLANID%"
+  },
+  "weathermap": {
+    "use_cacti": "no"
+  }
+}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
index 320970113114a9404bb61e7920f61b703f2c6362..501da9169349263c288a0692002e8b5b4086d921 100644
--- a/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
+++ b/data/grid5000/sites/nancy/network_equipments/sgriffon1.json
@@ -163,9 +163,7 @@
 
         },
         {
-          "kind": "node",
-          "port": "eth2",
-          "uid": "griffon-11"
+
         },
         {
           "kind": "switch",
@@ -174,24 +172,6 @@
       ],
       "rate": 10000000000,
       "snmp_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-    },
-    {
-      "kind": "node",
-      "naming_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%",
-      "ports": [
-        {
-
-        },
-        {
-
-        },
-        {
-          "port": "eth2",
-          "uid": "griffon-12"
-        }
-      ],
-      "rate": 10000000000,
-      "snmp_pattern": "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
     }
   ],
   "model": "3com 4500g",
diff --git a/generators/input/sites/nancy/clusters/graoully/graoully.rb b/generators/input/sites/nancy/clusters/graoully/graoully.rb
index 13928543496454d0de3526c6b9b57d66fc327a7a..35f25f7ae4fe1bebd082763503d9b4e7e7f9b5f8 100644
--- a/generators/input/sites/nancy/clusters/graoully/graoully.rb
+++ b/generators/input/sites/nancy/clusters/graoully/graoully.rb
@@ -179,7 +179,7 @@ site :nancy do |site_uid|
           :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
           :mountable        => true,
           :mounted          => true,
-          :bridged          => true,
+          :bridged          => false,
           :device           => "ib0",
           :vendor           => 'Mellanox',
           :model            => 'MT27500 Family [ConnectX-3]',
diff --git a/generators/input/sites/nancy/clusters/griffon/griffon.rb b/generators/input/sites/nancy/clusters/griffon/griffon.rb
new file mode 100644
index 0000000000000000000000000000000000000000..53f8c0c58ad7283b09aea332a43c428d63805456
--- /dev/null
+++ b/generators/input/sites/nancy/clusters/griffon/griffon.rb
@@ -0,0 +1,280 @@
+site :nancy do |site_uid|
+
+  cluster :griffon do |cluster_uid|
+    model "Carri System CS-5393B"
+    created_at Time.parse("2009-04-10").httpdate
+    kavlan true
+    queues ['admin', 'default']
+    ([*0..28]+[*57..59]).each do |i|
+      node "#{cluster_uid}-#{i+1}" do |node_uid|
+
+        performance({
+        :core_flops => 7.963.G,
+        :node_flops => 52.5.G
+      })
+
+        supported_job_types({
+          :deploy       => true,
+          :besteffort   => true,
+          :max_walltime => 0,
+          :virtual      => lookup(node_uid, node_uid, 'supported_job_types', 'virtual'),
+          :queues       => ['admin', 'default']
+        })
+
+        architecture({
+          :smp_size       => lookup(node_uid, node_uid, 'architecture', 'smp_size'),
+          :smt_size       => lookup(node_uid, node_uid, 'architecture', 'smt_size'),
+          :platform_type  => lookup(node_uid, node_uid, 'architecture', 'platform_type')
+        })
+
+        processor({
+          :vendor             => lookup(node_uid, node_uid, 'processor', 'vendor'),
+          :model              => lookup(node_uid, node_uid, 'processor', 'model'),
+          :version            => lookup(node_uid, node_uid, 'processor', 'version'),
+          :clock_speed        => lookup(node_uid, node_uid, 'processor', 'clock_speed'),
+          :instruction_set    => lookup(node_uid, node_uid, 'processor', 'instruction_set'),
+          :other_description  => lookup(node_uid, node_uid, 'processor', 'other_description'),
+          :cache_l1           => lookup(node_uid, node_uid, 'processor', 'cache_l1'),
+          :cache_l1i          => lookup(node_uid, node_uid, 'processor', 'cache_l1i'),
+          :cache_l1d          => lookup(node_uid, node_uid, 'processor', 'cache_l1d'),
+          :cache_l2           => lookup(node_uid, node_uid, 'processor', 'cache_l2'),
+          :cache_l3           => lookup(node_uid, node_uid, 'processor', 'cache_l3')
+        })
+
+        main_memory({
+          :ram_size     => lookup(node_uid, node_uid, 'main_memory', 'ram_size'),
+          :virtual_size => nil
+        })
+
+        operating_system({
+          :name     => lookup(node_uid, node_uid, 'operating_system', 'name'),
+          :release  => "Jessie",
+          :version  => lookup(node_uid, node_uid, 'operating_system', 'version'),
+          :kernel   => lookup(node_uid, node_uid, 'operating_system', 'kernel')
+        })
+        storage_devices [{
+          :interface  => 'SATA II',
+          :size       => lookup(node_uid, node_uid, 'block_devices', 'sda', 'size'),
+          :driver     => "ahci",
+          :device     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'device'),
+          :model      => lookup(node_uid, node_uid, 'block_devices', 'sda', 'model'),
+          :vendor     => lookup(node_uid, node_uid, 'block_devices', 'sda', 'vendor'),
+          :rev        => lookup(node_uid, node_uid, 'block_devices', 'sda', 'rev'),
+          :storage    => 'HDD'
+        }]
+
+        if (11<=i+1 and i+1<=14) then
+          network_adapters [{
+            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
+            :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
+            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
+            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
+            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
+            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
+            :bridged          => true,
+            :device           => "eth0",
+            :vendor           => "intel",
+            :version          => "80003ES2LAN",
+            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
+            :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
+            :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
+            :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
+            :switch           => net_switch_lookup('nancy','griffon', node_uid),
+            :switch_port      => net_port_lookup('nancy','griffon', node_uid),
+            :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
+          },
+          {
+            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
+            :rate             => 1.G,
+            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
+            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
+            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
+            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
+            :bridged          => false,
+            :device           => "eth1",
+            :vendor           => "intel",
+            :version          => "BCM5721",
+            :switch           => net_switch_lookup('nancy','griffon', node_uid, 'eth1'),
+            :switch_port      => net_port_lookup('nancy','griffon', node_uid, 'eth1'),
+            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
+            :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
+          },
+          {
+            :interface        => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'interface'),
+            :rate             => 10.G,
+            :enabled          => false, # see bug 6490,
+            :management       => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'management'),
+            :mountable        => false, # see bug 6490,
+            :mounted          => false, # see bug 6490,
+            :bridged          => false,
+            :device           => "eth2",
+            :vendor           => "myrinet",
+            :version          => "Myri-10G",
+            :driver           => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'driver'),
+            :mac              => lookup('griffon_manual', node_uid, 'network_interfaces', 'eth2', 'mac')
+          },
+          {
+            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
+            :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
+            :device           => "ib0",
+            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'enabled'),
+            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
+            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mountable'),
+            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mounted'),
+            :vendor           => 'Mellanox',
+            :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'version'),
+            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
+            :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
+            :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip'),
+            :ip6               => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
+            :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid'),
+            :switch           => "sgriffonib",
+            :ib_switch_card   => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'line_card'),
+            :ib_switch_card_pos => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'position'),
+            :hwid             => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'hwid')
+          },
+          {
+            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'interface'),
+            :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'rate'),
+            :device           => "ib1",
+            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'enabled'),
+            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'management'),
+            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mountable'),
+            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mounted'),
+            :vendor           => 'Mellanox',
+            :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'version'),
+            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'driver'),
+            :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'guid')
+          },
+          {
+            :interface            => 'Ethernet',
+            :rate                 => 100.M,
+            :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+            :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
+            :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
+            :switch               => lookup('griffon_manual', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
+            :switch_port          => lookup('griffon_manual', node_uid, 'network_interfaces', 'bmc', 'switch_port'),
+            :enabled              => true,
+            :mounted              => false,
+            :mountable            => false,
+            :management           => true,
+            :device               => "bmc",
+            :vendor               => "Tyan",
+            :version              => "M3296"
+          }]
+	else
+          network_adapters [{
+            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'interface'),
+            :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'rate'),
+            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'enabled'),
+            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'management'),
+            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mountable'),
+            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mounted'),
+            :bridged          => true,
+            :device           => "eth0",
+            :vendor           => "intel",
+            :version          => "80003ES2LAN",
+            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'driver'),
+            :network_address  => "#{node_uid}.#{site_uid}.grid5000.fr",
+            :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip'),
+            :ip6              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'ip6'),
+            :switch           => net_switch_lookup('nancy','griffon', node_uid),
+            :switch_port      => net_port_lookup('nancy','griffon', node_uid),
+            :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth0', 'mac')
+          },
+          {
+            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'interface'),
+            :rate             => 1.G,
+            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'enabled'),
+            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
+            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mountable'),
+            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
+            :bridged          => false,
+            :device           => "eth1",
+            :vendor           => "intel",
+            :version          => "BCM5721",
+            :switch           => net_switch_lookup('nancy','griffon', node_uid, 'eth1'),
+            :switch_port      => net_port_lookup('nancy','griffon', node_uid, 'eth1'),
+            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'driver'),
+            :mac              => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mac')
+          },
+          {
+            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'interface'),
+            :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'rate'),
+            :device           => "ib0",
+            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'enabled'),
+            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
+            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mountable'),
+            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mounted'),
+            :vendor           => 'Mellanox',
+            :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'version'),
+            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'driver'),
+            :network_address  => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
+            :ip               => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip'),
+            :ip6               => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'ip6'),
+            :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'guid'),
+            :switch           => "sgriffonib",
+            :ib_switch_card   => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'line_card'),
+            :ib_switch_card_pos => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'position'),
+            :hwid             => lookup('griffon_manual', node_uid, 'network_interfaces', 'ib0', 'hwid')
+          },
+          {
+            :interface        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'interface'),
+            :rate             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'rate'),
+            :device           => "ib1",
+            :enabled          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'enabled'),
+            :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'management'),
+            :mountable        => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mountable'),
+            :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'mounted'),
+            :vendor           => 'Mellanox',
+            :version          => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'version'),
+            :driver           => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'driver'),
+            :guid             => lookup(node_uid, node_uid, 'network_interfaces', 'ib1', 'guid')
+          },
+          {
+            :interface            => 'Ethernet',
+            :rate                 => 100.M,
+            :network_address      => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+            :ip                   => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'ip'),
+            :mac                  => lookup(node_uid, node_uid, 'network_interfaces', 'bmc', 'mac'),
+            :switch               => lookup('griffon_manual', node_uid, 'network_interfaces', 'bmc', 'switch_name'),
+            :switch_port          => lookup('griffon_manual', node_uid, 'network_interfaces', 'bmc', 'switch_port'),
+            :enabled              => true,
+            :mounted              => false,
+            :mountable            => false,
+            :management           => true,
+            :device               => "bmc",
+            :vendor               => "Tyan",
+            :version              => "M3296"
+          }]
+	end
+
+        chassis({
+          :serial       => lookup(node_uid, node_uid, 'chassis', 'serial_number'),
+          :name         => lookup(node_uid, node_uid, 'chassis', 'product_name'),
+          :manufacturer => lookup(node_uid, node_uid, 'chassis', 'manufacturer')
+        })
+
+        bios({
+          :version      => lookup(node_uid, node_uid, 'bios', 'version'),
+          :vendor       => lookup(node_uid, node_uid, 'bios', 'vendor'),
+          :release_date => lookup(node_uid, node_uid, 'bios', 'release_date')
+        })
+
+        gpu({
+          :gpu  => false
+        })
+
+        sensors({
+          :power => {
+            :available => true, # Set to true when pdu resources will be declared
+            :via => {
+              :pdu => [ { :uid => lookup('griffon_manual', node_uid, 'pdu', 'pdu_name') } ]
+            }
+          }
+        })
+
+      end
+    end
+  end # cluster griffon
+end # nancy
diff --git a/generators/input/sites/nancy/clusters/grimoire/grimoire.rb b/generators/input/sites/nancy/clusters/grimoire/grimoire.rb
index f8de98002e433d7ba6436b48a746132ce312c648..67ba4e06a6fe6a58aa4e094d2d5318f167383e31 100644
--- a/generators/input/sites/nancy/clusters/grimoire/grimoire.rb
+++ b/generators/input/sites/nancy/clusters/grimoire/grimoire.rb
@@ -219,7 +219,7 @@ site :nancy do |site_uid|
           :management       => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'management'),
           :mountable        => true,
           :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'ib0', 'mounted'),
-          :bridged          => true,
+          :bridged          => false,
           :device           => "ib0",
           :vendor           => 'Mellanox',
           :model            => 'MT27500 Family [ConnectX-3]',
diff --git a/generators/input/sites/nancy/clusters/grisou/grisou.rb b/generators/input/sites/nancy/clusters/grisou/grisou.rb
index 5525d3ce390a6b34bad968bc78db967dbf7017fc..7dc74e0df9742374329cecc8d59e2cd58f9e3eaa 100644
--- a/generators/input/sites/nancy/clusters/grisou/grisou.rb
+++ b/generators/input/sites/nancy/clusters/grisou/grisou.rb
@@ -100,7 +100,7 @@ site :nancy do |site_uid|
           :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'management'),
           :mountable        => true,
           :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth1', 'mounted'),
-          :bridged          => true,
+          :bridged          => false,
           :device           => "eth1",
           :vendor           => 'Intel Corporation',
           :model            => '82599ES 10-Gigabit SFI/SFP+ Network Connection',
@@ -116,7 +116,7 @@ site :nancy do |site_uid|
           :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
           :mountable        => true,
           :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'mounted'),
-          :bridged          => true,
+          :bridged          => false,
           :device           => "eth2",
           :vendor           => 'Intel Corporation',
           :model            => 'Ethernet 10G 2P X520 Adapter',
@@ -132,7 +132,7 @@ site :nancy do |site_uid|
           :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'management'),
           :mountable        => true,
           :mounted          => lookup(node_uid, node_uid, 'network_interfaces', 'eth3', 'mounted'),
-          :bridged          => true,
+          :bridged          => false,
           :device           => "eth3",
           :vendor           => 'Intel Corporation',
           :model            => 'Ethernet 10G 2P X520 Adapter',
@@ -384,7 +384,7 @@ site :nancy do |site_uid|
           :management       => lookup(node_uid, node_uid, 'network_interfaces', 'eth2', 'management'),
           :mountable        => true,
           :mounted          => true,
-          :bridged          => true,
+          :bridged          => false,
           :device           => "eth2",
           :vendor           => 'Mellanox',
           :model            => 'MT27500 Family [ConnectX-3]',
diff --git a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
index 761531a6d3a58a11f9b61860c6df5f67f096ca0b..21df8b75abb74c175d2730a51bf5c72aa5cc9f78 100644
--- a/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
+++ b/input/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.yaml
@@ -1,8 +1,8 @@
 ---
 taurus-12:
   bios:
-    version: 1.2.6
-    release_date: 05/10/2012
+    version: 2.5
+    release_date: 01/22/2016
     vendor: Dell Inc.
   operating_system:
     kernel: 2.6.32-5-amd64
diff --git a/input/grid5000/sites/nancy/net-links/sgriffon1.yaml b/input/grid5000/sites/nancy/net-links/sgriffon1.yaml
index 0842fd71fc325bc1e65ad829bf77a91740670a99..f5a1fb4ff149135bbd70ee4e57b6e0a01192c1dd 100644
--- a/input/grid5000/sites/nancy/net-links/sgriffon1.yaml
+++ b/input/grid5000/sites/nancy/net-links/sgriffon1.yaml
@@ -70,22 +70,9 @@ sgriffon1:
       kind: other
       rate: 10000000000
       ports:
-        1:
-          uid: griffon-11
-          port: eth2
-          kind: node
         2: 
           uid: sgravillon1
           kind: switch
-    2:
-      naming_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      snmp_pattern: "Ten-GigabitEthernet1/%LINECARD%/%PORT%"
-      kind: node
-      rate: 10000000000
-      ports:
-        2:
-          uid: griffon-12
-          port: eth2
 
   channels:
     naming_pattern: Po%CHANNELID%