diff --git a/.gitignore b/.gitignore
index e43b0f988953ae3a84b00331d0ccf5f7d51cb3cf..f31b3e29c9b9bc6154db6a2009c1d2f63a5d197b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .DS_Store
+*.swp
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
index da9121113bee0e6a4f69d71f58a5bb65bd395138..abdd9229f9fcb7a75e82b0fc3bd6fafa95976dee 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-1.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
index 3852bb3b79619c542bf9ce71ca01b290c8ab3edc..98330584fede43587a942558638e1c2c1adfb649 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-10.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
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 3bca221f98a072fd39c2d675ca2ee808e3673826..e8391171655d8539abd8ae298126017fc97f24fe 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-11.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
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 9758139485323c2abd850c1aa4d097d00b396db8..1f96c41936ceb87a9c6060ffef7cfd6376bca5fb 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-12.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
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 804060558a9ecaf985b65a16aed90989b6a4c35d..8f2dc5ff9f3f5e24e64fdc20b34171c81d10e782 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-13.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
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 2e6bad063cb048ac8e4d5a83945dbce3692d6b30..b022dbeeca04ae5eb81ffe7eb71132318775cd0c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-14.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
index 94be6deb25163ea27e055ceec429770911982c52..8bd3d36e0066b0e74d5c99bf540e59021c66e2e1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-15.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
index 17ec8fd9fbd3dbd69411b8b157835033fdbf414d..3dc5929ece995402a4b64d153d5b46273c78be78 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-16.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
index bcbbf3ca0d52493282da7ce7f96272c29be381f2..7fa2b21f1ac8443ebab01e71156bbe143070939a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-17.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
index 5c84cf8b52aa40d3e703fd2cd378573df170de15..25edf4f65d4421affed8777c2282026a5d096e15 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-18.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
index 88ee9f3bdf7c9064b9489eec9ba039df21f18c3a..e52d95385ee26eed36c0fbb3f26503d18889bf65 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-19.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
index e97d37b65e453418d07f9fbed5cf7097e2cb2345..a9d59892aeb7240120d0e6f67791ceef2d373572 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-2.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
index 08bb605b711e4d2e0e88ffef4c696dcd2c3642a8..cc70849dd7824383d1ec8b2c0552d215565c2fad 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-20.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
index 84e5a410162fa18f1dd33002f60ac6545e34a729..eeca8fa290b2ecc45bccafcd824cab9457774f8b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-21.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
index 8810a2f90a77fd69054c001891316c494fc9f913..2d7a48147123a3034142744dacd52be65b2bf17c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-22.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
index bc4f80b4fde6b425c4d4263b47c8fbc01179fdfa..4557d3427e56352a3afd61162a7c48f57a3a9f2f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-23.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
index f4f09b049e59c2fdcfbf422437d83b9ccbc0b205..3ecb7bf427535fde16d8a077c5e92d408c504197 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-24.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
index 5ddf0ebfeadbec28e952d1dac823db6af56ce6d6..02e978a841466487e924570a2cce465fcf17706e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-25.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
index 9b251e7f8fcbffe6074e17e367993bb336f3b366..b281b7e745a3bc139c760ec698a12faee8185b0f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-26.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
index 723425fc4f0b51009adf370610c097de2ec303e1..26034e8d2a1753dbad3fe354501bdfc3ad4df53c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-27.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
index 4f01c818917f78dd856c441ac6c57b9421687f16..996d3e1a22165299ffca5f203079cf266488e296 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-28.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
index ab637034954eb75d77044ea0d22db8004540fc47..f8afae93a3debbda280a1bb20d83b27fe0d30a1e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-29.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
index f4ecc3792654ef1d2505731a680baa9ee146cca8..58753606ec3800dc7bd7691618063944e9b46835 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-3.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
index ee81570aae651c3a9fc5890d7410496f65391013..227bc2adf5b759a9646752b69d4e41bfcb9aa629 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-30.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
index e2afb9231135c620b7480cbc34ded5771a9c7f42..60a9a461175d6bbef1a5545435a8b67885f49ffe 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-31.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
index 334d860f2c147a4fc02cb02113850166c2fe6099..251b4a328933a07c6bcf858fd280be94d57b314e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-32.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
index e061d06675d9674ee9baa49dfafc4de18304f7af..57b99468c96773ac3baa1faa1f54d90d7d3cc802 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-33.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
index 5489016be4f4028319195b8bb766c14fdd8a8068..a46fdb184fc4df4fc26552c6c107dbff8336f107 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-34.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
index 518bd67a0c0055d761a482c120521baee5252524..048da6f52499eb69a433bdcaa6d0e2bc488bfa5a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-35.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
index 07a7f4b6a8d791143e8eb8d7199b5d2b39e45d6d..26d585a7f811e2cbae9916fa67f2611345764c71 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-36.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
index 62472520cb4a6ca742080e9a64963e0428ccf1ec..9d3dcd681138fd7ce456af54da13361eea33d7ff 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-37.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
index d927731e0db0cee8f5d3ba076a42632431cfaeae..629af924a2329f69e67951e4e04682705b806cf2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-38.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
index d0d3b85b920332b67d2b47ddcf9b274153f2e686..3228a42daf35a282ded185a51eacf4cd5a01373c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-39.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
index 2ece27ac615e0f9e62549d8bcfe3ad6b3077e601..2fc758a699e3f433c40cc03ac72de0510a180fd5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-4.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
index c8e4281afc2c96131a78b9b85433bd4dd15bf70e..369f927d91a9d3e02cc85a38a9af0eefa7ef9e1c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-40.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
index e92cde4db39d7b252731b4bda5a22f1966f90a9e..8d1758c9671005faba3ab1b6529f52bea031cf5a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-41.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
index 32f0a48d2a2c6ceed26cff7e3f89d16507ad7bc3..aa97c07709d53e81d39553a62ad285dbc50f913f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-42.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
index 133d808954d0a9917253f9824a1e54a9eecf171e..1f8cf3878cb9fa4f358710ee6e0a637ecb0b6786 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-43.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
index c8012fc4af91acc45fca9cacf6df8d7d345a23bc..d6d0ec9654df92b56289699fc660dddef0dddecf 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-44.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
index 26451beebe8531f735ba4028408aef093b355406..7f420ed399362f9aeb44fe458048e71a49a9b0bb 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-45.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
index 0c8ed07f64d7ecba1e18df6de32fea702ef30fe6..331e42305fc12dec9a98221666f9aa3a10e2b859 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-46.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
index d9838f3a9e46715dd6bdefb653c2ee85c06eec64..3d8b2eb7a54cba1272c730c250c2cdb796b03845 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-47.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
index e30451b5dad7893965bf377758b222897009a468..e764a082bad20a15ce3898ed0be9aa46c86e3700 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-48.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
index d4826c4a55d8064b6fc5b01ba73046cfbd02f5ec..36fab420b212316f6989d808a18468017e2188cd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-49.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
index 16ae7bb270dd734aae088979201ab155f1f58caa..f848309bc2b7c22d15baa2ce1bd9833f073120dc 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-5.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
index acab2ecd3078da62ff5a2925fd4c8c0a7a7cb84f..dc0b2aeb7f33cdd143be0e1dc63f15b61b8996bd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-50.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
index 9429744580b2726a68e302c8efa88616bea98bda..a9788a97ff1e2c727dd03b476f651c26777a2a98 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-51.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
index 171a9fe415944adb55c0d1dc6924c704f57c981c..4b24b407f225af94f4b51370f308fcdb3d867857 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-52.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
index 334ab7445cd5ba93e45cfef5b9e6590385a5c4e0..8e46c981a96eddb672937d25cf8528169b55ad34 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-53.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
index 2c0d6d54d0dd939c2a2ab137e3948c5bbf87ea0c..7ec323a6a4f48a0d29c6c8639f1b8d1ee70ac126 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-54.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
index 439e5adff59c76a32fbcf9016f1c99132a125bdd..d5b1967731da2582be4a10f5d6053e55e5b4dc5b 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-55.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
index 55d070fdd17e032c05792f8b6ce37ae55ecc0656..c0a2418f47be2cce63c4a7a82514e789a77a2926 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-56.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
index b909648da0936cfc5c0d8d79b6f83503d2354d57..d7eb4864e3fae810143dcd51b42292b4631337e0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-57.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
index a3cd1b92b87f9b24977de1b7ebb210f45f8b1cdf..eb71104f0a3f1c79ec6b56e1af564a9d127b2fa3 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-58.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
index 0919922f9eba60ab558d7529aac961d557b803d5..d20f52cac8b118af51321d7e32ba9bdaabf556c1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-59.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
index 8bb1da187c76efe91753ebf08eedcbf3d985708d..81a13faee8abac76df189e3c79bf8459b411514a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-6.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
index c823f4bcaf36c74023d053145966a8c2e35bf96a..c85266ec2481fca2956a0c6cbcca68a81782086c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-60.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
index ffb6f14fb579ccfd860f57a8eac8cde938a87909..0b59a6463f56c3bb7b1c098dfa4dbc69ec5ba2dd 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-61.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
index 69986b8dba8375fb9e5b0aaa60f3c456b6018f77..794b000600e85fbacb22385a36f482ae17296031 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-62.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
index 7d09a92651664f742ff9b3b47108b3fc1c126039..fdca307d1422819b42651c6485c4f5ee85e3dbea 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-63.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
index 853b3faf3c55caabd86b676712cc06275c2cc0fa..25c972340f778e24c353bf28d0f346c3ecc437b6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-64.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
index 76993b3707242720b3ca16e22908a22b53d14279..0690ee2123da72831699750da8ffabef297ae591 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-65.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
index d7e63aa3d65ed02267abb54fb6eaa631aed0f52e..1f381101578c09d8bd92e0fd7e462278c7ba211a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-66.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
index 4857682c178639296d4fb780260dbf009ee7953e..82fe771ec846fc23d7970fbf2cfa2c2015a596c2 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-67.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
index be25d6dbdd5e32e3bb3a0cdf21d7b0dbfc5d4d23..d54b39bd7c5feaebb2b99f1b19c99dc127ac8ea5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-68.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
index de3b024ccf15e0174fa229e54f7895ccafcdfe77..30438d7bb5f2e58fdd4fdc1ddc44ec41c69d32c5 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-69.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
index a2bd78a59f69ae3116561d2f37b5a64f4d459ba7..e85641a3af83d125ef303012cb71a10f3856063d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-7.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
index cf7aeb0d2250c288910c9804addfdd4809d38892..350d36eff377388b5df1aadd9c921e2f4c74495d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-70.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
index 05a84a5fa57c7b3bc62dc5ef23a49c067b77e67f..d3c44d3cff40e076d97e1a674a1736ca722fd6e9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-71.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
index b35e7e374a8625abd37de3a6bfc1f57328c3b64c..f0312594a876b7e20323f50ddd2dd546d01f65f1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-72.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
index 34178919403a55032ee4610437bc272bed3f3d84..f8f5feabf643c823319c835fe1f811024c05b000 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-73.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
index 9116ebb23a2a574593fa7ed896abf3a0eb90a833..d371f178aeb584d8327c70f8fcc69bc1829b91a6 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-74.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
index ee8f1a0b5e65b84fbb55fc64ac78482dc049f210..fa95db8338aecf82ec8a99aaa0f7a309fcd6a631 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-75.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
index c0017797da568d695f2e2cce3eb215a4a92c2349..4932466a8fa407fd3866710a205e8b1580e835a9 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-76.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
index 8a8c3c184ab0645e4717d561b96c8d6b18cb442b..6baefaa10d752de97389a6af6de228d90686cb6c 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-77.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
index 4f1ef641c9e2f630d00ac1ea10bf02c70996e863..341ed9f10c44d84b5ee3cfbc1e0e818ecd7a8a54 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-78.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
index 48937915d3c569f90205e08a0c8895030442cbfb..293dc79aa5507b388ac59c9d506dfbbfc391799a 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-79.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
index c3546bb4cffa1ab010bdf6ccd654a9dde4c01f1c..eb84e45a0d11fa2a504c844e34a2485223a4e282 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-8.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
index 9169357c74ad96451df8177c7bc00cdc99d6f765..9e0ac9c163435347d6100bcb83a67ba91717dd43 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-80.json
@@ -20,7 +20,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.16.65.80",
-      "mac": "00:E0:81:B2:BF:EE",
+      "mac": "00:E0:81:B2:C1:F6",
       "management": false,
       "mountable": true,
       "mounted": true,
@@ -34,7 +34,7 @@
     {
       "enabled": false,
       "interface": "Ethernet",
-      "mac": "00:E0:81:B2:BF:EF",
+      "mac": "00:E0:81:B2:C1:F7",
       "rate": 1000000000,
       "vendor": "intel",
       "version": "BCM5721"
@@ -69,7 +69,7 @@
       "enabled": true,
       "interface": "Ethernet",
       "ip": "172.17.65.80",
-      "mac": "00:E0:81:4F:CA:A6",
+      "mac": "00:E0:81:4F:B5:AF",
       "management": true,
       "mountable": false,
       "mounted": false,
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
index 84fc7713b01bbf2f2d9d16e0b1b5d68dea76e4b0..c51b043ad308d1e3b18dfa74c66690008380f335 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-81.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
index bbe1f574f4f81cd48f0eb9efa52a1462fa579b0e..2b1037735bdf682f8cb6d54678a1af395da85f9e 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-82.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
index c32cbe9d8e9c4994b6a67d5b213b8f366a0b2b20..2f293d2e21ef674962fc7dd9d734d9ac75c0bc64 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-83.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
index 995e3f84ceb9018c56da72cc936c31d690d29bdc..401b50f771b52b09081c7e723e7aeae14dcfff18 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-84.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
index 76966877f1c2909cc1d7603c791545816708e8b1..ef9fb4a6abdba278902f296fbca3c136d36266b1 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-85.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
index dd618a42874e7544d06e21dbc59a183b1eebf7f1..8311cf50ce7cd17536d3a3422fa88ad8d687d2ff 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-86.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
index 4538630b5c1eec8aa7e723457d05ae5ab0ed413b..fe1fa894f54175ace1a319a9264d1324786d4a1d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-87.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
index b8d8da87dc78dfba579a9305cf38d02fdec877cc..b75ee1a3a7d78db431453c0ccb7bfe7a9586845f 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-88.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
index ea86972a01d904e810b088e06fe75a4cc8055799..182e037ea7263fa03b9d16247c9b5ef5311a5321 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-89.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
index e97ff1dd89a27663129cc0b4656aeef5b65366c1..24147e90547a7dfd186bc8abd5b2f11d70c9cb2d 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-9.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
index 25f5b77a352556c4795a0c6a3e8bbc96ebc58904..52efc45694d2812fc5965373fe068a565f5128e0 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-90.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
index ebe3a02566e8bbde4b0af5b3231f029391b33f47..2bea9b85fb560ee6fc7d4301be378fe57ed53449 100644
--- a/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
+++ b/data/grid5000/sites/nancy/clusters/griffon/nodes/griffon-92.json
@@ -110,8 +110,8 @@
       "device": "sda",
       "driver": "ata_piix",
       "interface": "SATA II",
-      "model": "Hitachi HDP72503",
-      "rev": "GM3O",
+      "model": "HDP725032GLA360",
+      "rev": "GM3OA5CA",
       "size": 298023223876.953
     }
   ],
diff --git a/generators/input/nancy-graphene.rb b/generators/input/nancy-graphene.rb
new file mode 100644
index 0000000000000000000000000000000000000000..37d6f8f0d97874802e84bf169ff42e4c85ec50bd
--- /dev/null
+++ b/generators/input/nancy-graphene.rb
@@ -0,0 +1,149 @@
+site :nancy do |site_uid|
+
+  cluster :graphene do |cluster_uid|
+    model "Carri System 5393"
+    created_at Time.parse("2011-01-20").httpdate
+
+    144.times do |i|
+      node "#{cluster_uid}-#{i+1}" do |node_uid|
+        serial lookup('nancy-graphene', node_uid, 'serial')
+        supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
+        architecture({
+          :smp_size => 1,
+          :smt_size => 4,
+          :platform_type => "x86_64"
+          })
+        processor({
+          :vendor => "Intel",
+          :model => "Intel Xeon",
+          :version => "X3440",
+          :clock_speed => 2.53.G,
+          :instruction_set => "",
+          :other_description => "",
+          :cache_l1 => nil,
+          :cache_l1i => nil,
+          :cache_l1d => nil,
+          :cache_l2 => 8.MiB
+        })
+        main_memory({
+          :ram_size => 16.GiB,
+          :virtual_size => nil
+        })
+        operating_system({
+          :name => "Debian",
+          :release => "5.0",
+          :version => nil,
+          :kernel => "2.6.26"
+        })
+        storage_devices [{
+          :interface => 'SATA II',
+          :size => 320.GB,
+          :driver => "ahci",
+          :device => "sda",
+          :model => lookup('nancy-graphene', node_uid, 'disk_model'),
+          :rev => lookup('nancy-graphene', node_uid, 'disk_rev')
+        }]
+        network_adapters [{
+          :interface => 'Ethernet',
+          :rate => 1.G,
+          :device => "eth0",
+          :enabled => true,
+          :mounted => true,
+          :mountable => true,
+          :management => false,
+          :switch => lookup('nancy-graphene', "#{node_uid}", 'switch_eth0'),
+          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_eth0'),
+          :switch_port => lookup('nancy-graphene', "#{node_uid}", 'switch_pos_eth0'),
+          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+          #:ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+          :ip => lookup('nancy-graphene', node_uid, 'ip_eth0'),
+          :driver => "e1000e",
+          :vendor => "intel",
+          :version => "82574L"
+        },
+        {
+          :interface => 'Ethernet',
+          :rate => 1.G,
+          #:device => "eth1",
+          :enabled => false,
+          #:mounted => false,
+          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_eth1'),
+          #:management => false,
+          #:driver => "e1000e",
+          :vendor => "intel",
+          :version => "82574L"
+        },
+        {
+          :interface => 'Ethernet',
+          :rate => 1.G,
+          #:device => "eth2",
+          :enabled => false,
+          #:mounted => false,
+          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_eth2'),
+          #:management => false,
+          #:driver => "e1000e",
+          :vendor => "intel",
+          :version => "82574L"
+        },
+	{
+          :interface => 'InfiniBand',
+          :rate => 20.G,
+          :device => "ib0",
+          :enabled => true,
+          :mounted => true,
+          :mountable => true,
+          :management => false,
+          :ip => lookup('nancy-graphene', "#{node_uid}", 'ip_ib'),
+          :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
+	  :switch => "sgrapheneib",
+          #:ib_switch_card => lookup('nancy',"#{node_uid}", 'switch_ib_card'),
+          #:ib_switch_card_pos => lookup('nancy',"#{node_uid}", 'switch_ib_card_pos'),
+          :driver => "mlx4_core",
+          :vendor => "Mellanox",
+          :version => "MT26418",
+	  :mac  => lookup('nancy-graphene', node_uid, 'guidib0')
+        },
+        {
+          :interface => 'InfiniBand',
+          :rate => 20.G,
+          :enabled => false,
+          #:device => "ib1",
+          #:driver => "mlx4_core",
+          :vendor => "Mellanox",
+          :version => "MT26418",
+          #:mountable => false,
+          #:mounted => false,
+          #:management => false
+          :mac	=> lookup('nancy-graphene', node_uid, 'guidib1')
+        },
+        {
+          :interface => 'Ethernet',
+          :rate => 100.M,
+          :enabled => true,
+          :mounted => false,
+          :mountable => false,
+          :management => true,
+          :vendor => "Tyan",
+          :version => "AST2050",
+          :device => "bmc",
+          :ip => lookup('nancy-graphene', "#{node_uid}", 'ip_mgt'),
+          :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
+          :switch => lookup('nancy-graphene', "#{node_uid}", 'switch_ipmi'),
+          :switch_port => lookup('nancy-graphene', "#{node_uid}", 'switch_ipmi_pos'),
+          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_mgt'),
+        }]
+        pdu({
+          :vendor => "American Power Conversion",
+          :pdu => lookup('nancy-graphene', "#{node_uid}", 'pdu'),
+          :pdu_port => lookup('nancy-graphene', "#{node_uid}", 'pdu_pos')
+        })
+        bios({
+          :version	=> lookup('nancy-graphene', node_uid, 'bios_ver'),
+          :vendor	=> "American Megatrends Inc.",
+          :release_date	=> lookup('nancy-graphene', node_uid, 'bios_release')
+        })
+
+      end
+    end
+  end # cluster graphene
+end
diff --git a/generators/input/nancy-griffon.rb b/generators/input/nancy-griffon.rb
new file mode 100644
index 0000000000000000000000000000000000000000..b77a9eb89f6a0274f27d3724eb4e9eeae009fe5e
--- /dev/null
+++ b/generators/input/nancy-griffon.rb
@@ -0,0 +1,129 @@
+site :nancy do |site_uid|
+
+  cluster :griffon do |cluster_uid|
+    model "Carri System CS-5393B"
+    created_at Time.parse("2009-04-10").httpdate
+    92.times do |i|
+      node "#{cluster_uid}-#{i+1}" do |node_uid|
+        serial lookup('nancy-griffon', node_uid, 'serial')
+        supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
+        architecture({
+          :smp_size => 2,
+          :smt_size => 8,
+          :platform_type => "x86_64"
+          })
+        processor({
+          :vendor => "Intel",
+          :model => "Intel Xeon",
+          :version => "L5420",
+          :clock_speed => 2.5.G,
+          :instruction_set => "",
+          :other_description => "",
+          :cache_l1 => nil,
+          :cache_l1i => nil,
+          :cache_l1d => nil,
+          :cache_l2 => 12.MiB
+        })
+        main_memory({
+          :ram_size => 16.GiB,
+          :virtual_size => nil
+        })
+        operating_system({
+          :name => "Debian",
+          :release => "5.0",
+          :version => nil,
+	  :kernel => "2.6.26"
+        })
+        storage_devices [{
+          :interface => 'SATA II',
+          :size => 320.GB,
+          :driver => "ata_piix",
+	  :device => "sda",
+	  :model => lookup('nancy-griffon', node_uid, 'disk_model'),
+	  :rev => lookup('nancy-griffon', node_uid, 'disk_rev')
+        }]
+        network_adapters [{
+          :interface => 'Ethernet',
+          :rate => 1.G,
+          :device => "eth0",
+          :enabled => true,
+          :mounted => true,
+          :mountable => true,
+          :management => false,
+          :switch => lookup('nancy-griffon', "#{node_uid}", 'switch_eth0'),
+          :mac => lookup('nancy-griffon', "#{node_uid}", 'mac_eth0'),
+          :switch_port => lookup('nancy-griffon', "#{node_uid}", 'switch_pos_eth0'),
+          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
+          #:ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
+          :ip => lookup('nancy-griffon', node_uid, 'ip_eth0'),
+          :driver => "e1000e",
+	  :vendor => "intel",
+	  :version => "80003ES2LAN"
+        },
+        {
+          :interface => 'Ethernet',
+          :rate => 1.G,
+          :enabled => false,
+          #:mounted => false,
+          :mac => lookup('nancy-griffon', "#{node_uid}", 'mac_eth1'),
+          #:mountable => false,
+          #:management => false,
+          #:driver => "e1000e",
+	  :vendor => "intel",
+	  :version => "BCM5721"
+        },
+	{
+          :interface => 'InfiniBand',
+          :rate => 20.G,
+          :device => "ib0",
+          :enabled => true,
+          :mounted => true,
+          :mountable => true,
+          :management => false,
+          :ip => lookup('nancy-griffon', "#{node_uid}", 'ip_ib'),
+          :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
+	  :switch => "sgriffonib",
+          :ib_switch_card => lookup('nancy-griffon',"#{node_uid}", 'switch_ib_card'),
+          :ib_switch_card_pos => lookup('nancy-griffon',"#{node_uid}", 'switch_ib_card_pos'),
+          :driver => "mlx4_core", :vendor => "Mellanox", :version => "MT26418",
+	  :mac  => lookup('nancy-griffon', node_uid, 'guidib0')
+        },
+        {
+          :interface => 'InfiniBand',
+          :rate => 20.G,
+          :enabled => false,
+          #:mountable => false,
+          #:mounted => false,
+          #:management => false,
+          :vendor => "Mellanox",
+	  :version => "MT26418",
+	  :mac	=> lookup('nancy-griffon', node_uid, 'guidib1')
+        },
+        {
+          :interface => 'Ethernet',
+          :rate => 100.M,
+          :enabled => true,
+          :mounted => false,
+          :mountable => false,
+          :management => true,
+          :vendor => "Tyan", :version => "M3296",
+          :ip => lookup('nancy-griffon', "#{node_uid}", 'ip_ipmi'),
+          :network_address => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
+          :switch => lookup('nancy-griffon', "#{node_uid}", 'switch_ipmi'),
+          :switch_port => lookup('nancy-griffon', "#{node_uid}", 'switch_ipmi_pos'),
+          :mac => lookup('nancy-griffon', "#{node_uid}", 'mac_ipmi'),
+        }]
+	pdu({
+	  :vendor => "American Power Conversion",
+          :pdu => lookup('nancy-griffon', "#{node_uid}", 'pdu'),
+	  :pdu_port => lookup('nancy-griffon', "#{node_uid}", 'pdu_pos')
+	})
+	bios({
+	  :version	=> lookup('nancy-griffon', node_uid, 'bios_ver'),
+	  :vendor	=> "Phoenix Technologies LTD",
+	  :release_date	=> lookup('nancy-griffon', node_uid, 'bios_release')
+	})
+      end
+    end
+  end # cluster griffon
+end
diff --git a/generators/input/nancy-griffon.yaml b/generators/input/nancy-griffon.yaml
index 63bcf827de519e505829d7dfdc99e58800b479d8..b66494790064255c91fe5a75ecc5ec5ae0a80ae6 100644
--- a/generators/input/nancy-griffon.yaml
+++ b/generators/input/nancy-griffon.yaml
@@ -23,10 +23,10 @@ griffon-1:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:f1
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:f2
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-2:
   serial: "812530007"
   mac_eth0: 00:E0:81:B2:C4:BC
@@ -51,10 +51,10 @@ griffon-2:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:65
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:66
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-3:
   serial: "812530008"
   mac_eth0: 00:E0:81:B2:C1:FE
@@ -79,10 +79,10 @@ griffon-3:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:61
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:62
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-4:
   serial: "812530009"
   mac_eth0: 00:E0:81:B2:BF:E4
@@ -107,10 +107,10 @@ griffon-4:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:69
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:6a
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-5:
   serial: "812530010"
   mac_eth0: 00:E0:81:B2:C1:FC
@@ -135,10 +135,10 @@ griffon-5:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c1
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c2
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-6:
   serial: "812530011"
   mac_eth0: 00:E0:81:B1:C4:E7
@@ -163,10 +163,10 @@ griffon-6:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ad
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ae
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-7:
   serial: "812530012"
   mac_eth0: 00:E0:81:B2:C4:AC
@@ -191,10 +191,10 @@ griffon-7:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:55
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:56
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-8:
   serial: "812530013"
   mac_eth0: 00:E0:81:B2:C4:A0
@@ -219,10 +219,10 @@ griffon-8:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c9
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ca
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-9:
   serial: "812530014"
   mac_eth0: 00:E0:81:B2:C5:76
@@ -247,10 +247,10 @@ griffon-9:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5d
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5e
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-10:
   serial: "812530015"
   mac_eth0: 00:E0:81:B2:C0:A4
@@ -275,10 +275,10 @@ griffon-10:
   bios_release: 08/21/2009
   guidib0: ""
   guidib1: ""
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-11:
   serial: "812530016"
   mac_eth0: 00:E0:81:B2:C2:4C
@@ -304,10 +304,10 @@ griffon-11:
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d9
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:da
   myri0: 00:60:dd:46:84:b7
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-12:
   serial: "812530017"
   mac_eth0: 00:E0:81:B2:C1:9E
@@ -333,10 +333,10 @@ griffon-12:
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:dd
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:de
   myri0: 00:60:dd:46:84:b9
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-13:
   serial: "812530018"
   mac_eth0: 00:E0:81:B2:C1:E4
@@ -362,10 +362,10 @@ griffon-13:
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:bd
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:be
   myri0: 00:60:dd:46:84:a8
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-14:
   serial: "812530019"
   mac_eth0: 00:E0:81:B1:C0:60
@@ -391,10 +391,10 @@ griffon-14:
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:cd
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ce
   myri0: 00:60:dd:46:84:b8
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-15:
   serial: "812530020"
   mac_eth0: 00:E0:81:B2:C4:C4
@@ -419,10 +419,10 @@ griffon-15:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b5
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b6
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-16:
   serial: "812530021"
   mac_eth0: 00:E0:81:B2:BF:A0
@@ -447,10 +447,10 @@ griffon-16:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:3f
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:40
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-17:
   serial: "812530022"
   mac_eth0: 00:E0:81:B2:C2:18
@@ -475,10 +475,10 @@ griffon-17:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:17
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:18
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-18:
   serial: "812530023"
   mac_eth0: 00:E0:81:B2:C2:04
@@ -503,10 +503,10 @@ griffon-18:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2b
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2c
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-19:
   serial: "812530024"
   mac_eth0: 00:E0:81:B2:C5:60
@@ -531,10 +531,10 @@ griffon-19:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:37
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:38
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-20:
   serial: "812530025"
   mac_eth0: 00:E0:81:B2:C5:74
@@ -559,10 +559,10 @@ griffon-20:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:cb
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:cc
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-21:
   serial: "812530026"
   mac_eth0: 00:E0:81:B2:BF:CC
@@ -587,10 +587,10 @@ griffon-21:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4f
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:50
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-22:
   serial: "812530027"
   mac_eth0: 00:E0:81:B2:BF:A6
@@ -615,10 +615,10 @@ griffon-22:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:33
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:34
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-23:
   serial: "812530028"
   mac_eth0: 00:E0:81:B2:C1:56
@@ -643,10 +643,10 @@ griffon-23:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:2f
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:30
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-24:
   serial: "812530029"
   mac_eth0: 00:E0:81:B2:C2:2E
@@ -671,10 +671,10 @@ griffon-24:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d7
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d8
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-25:
   serial: "812530030"
   mac_eth0: 00:E0:81:B2:BF:E2
@@ -699,10 +699,10 @@ griffon-25:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:23
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:24
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-26:
   serial: "812530031"
   mac_eth0: 00:E0:81:B2:C1:C8
@@ -727,10 +727,10 @@ griffon-26:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d3
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d4
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-27:
   serial: "812530032"
   mac_eth0: 00:E0:81:B2:C0:C4
@@ -755,10 +755,10 @@ griffon-27:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:1f
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:20
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-28:
   serial: "812530033"
   mac_eth0: 00:E0:81:B2:C0:E5
@@ -783,10 +783,10 @@ griffon-28:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:db
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:dc
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-29:
   serial: "812530034"
   mac_eth0: 00:E0:81:B2:C4:B0
@@ -811,10 +811,10 @@ griffon-29:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:43
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:44
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-30:
   serial: "812530035"
   mac_eth0: 00:E0:81:B2:C0:B4
@@ -839,10 +839,10 @@ griffon-30:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:3b
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:3c
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-31:
   serial: "812530036"
   mac_eth0: 00:E0:81:B2:C2:24
@@ -867,10 +867,10 @@ griffon-31:
   bios_release: 12/02/2008
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:5f
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:60
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-32:
   serial: "812530037"
   mac_eth0: 00:E0:81:B2:C5:9E
@@ -895,10 +895,10 @@ griffon-32:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:5b
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:5c
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-33:
   serial: "812530038"
   mac_eth0: 00:E0:81:B2:BF:FA
@@ -923,10 +923,10 @@ griffon-33:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:57
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:58
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-34:
   serial: "812530039"
   mac_eth0: 00:E0:81:B2:54:D6
@@ -951,10 +951,10 @@ griffon-34:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:53
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:54
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-35:
   serial: "812530040"
   mac_eth0: 00:E0:81:B2:C4:D4
@@ -979,10 +979,10 @@ griffon-35:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4b
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:4c
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-36:
   serial: "812530041"
   mac_eth0: 00:E0:81:B2:C0:BE
@@ -1007,10 +1007,10 @@ griffon-36:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:1b
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:1c
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-37:
   serial: "812530042"
   mac_eth0: 00:E0:81:B2:C0:3E
@@ -1035,10 +1035,10 @@ griffon-37:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:59
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:5a
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-38:
   serial: "812530043"
   mac_eth0: 00:E0:81:B2:C1:D8
@@ -1063,10 +1063,10 @@ griffon-38:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:dd
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:de
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-39:
   serial: "812530044"
   mac_eth0: 00:E0:81:B2:C1:FA
@@ -1091,10 +1091,10 @@ griffon-39:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:e9
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ea
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-40:
   serial: "812530045"
   mac_eth0: 00:E0:81:B2:C0:CC
@@ -1119,10 +1119,10 @@ griffon-40:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:81
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:82
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-41:
   serial: "812530046"
   mac_eth0: 00:E0:81:B2:C4:98
@@ -1147,10 +1147,10 @@ griffon-41:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:d5
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:d6
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-42:
   serial: "812530047"
   mac_eth0: 00:E0:81:B2:C1:BA
@@ -1175,10 +1175,10 @@ griffon-42:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d1
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d2
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-43:
   serial: "812530048"
   mac_eth0: 00:E0:81:B2:C1:F4
@@ -1203,10 +1203,10 @@ griffon-43:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b9
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:ba
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-44:
   serial: "812530049"
   mac_eth0: 00:E0:81:B2:C1:B8
@@ -1231,10 +1231,10 @@ griffon-44:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d5
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:d6
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-45:
   serial: "812530050"
   mac_eth0: 00:E0:81:B2:C4:94
@@ -1259,10 +1259,10 @@ griffon-45:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b1
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:b2
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-46:
   serial: "812530051"
   mac_eth0: 00:E0:81:B1:C4:36
@@ -1287,10 +1287,10 @@ griffon-46:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:a9
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:aa
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-47:
   serial: "812530052"
   mac_eth0: 00:E0:81:B1:C4:CC
@@ -1315,10 +1315,10 @@ griffon-47:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:e1
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:e2
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-48:
   serial: "812530053"
   mac_eth0: 00:E0:81:B2:C0:8C
@@ -1343,10 +1343,10 @@ griffon-48:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:a5
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:a6
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-49:
   serial: "812530054"
   mac_eth0: 00:E0:81:B2:C2:2C
@@ -1371,10 +1371,10 @@ griffon-49:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:27
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:28
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-50:
   serial: "812530055"
   mac_eth0: 00:E0:81:B2:C2:10
@@ -1399,10 +1399,10 @@ griffon-50:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:d1
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:d2
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-51:
   serial: "812530056"
   mac_eth0: 00:E0:81:B2:C0:9E
@@ -1427,10 +1427,10 @@ griffon-51:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ed
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ee
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-52:
   serial: "812530057"
   mac_eth0: 00:E0:81:B2:C4:A8
@@ -1455,10 +1455,10 @@ griffon-52:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:85
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:7f:86
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-53:
   serial: "812530058"
   mac_eth0: 00:E0:81:B2:C0:30
@@ -1483,10 +1483,10 @@ griffon-53:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c5
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:02:80:c6
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-54:
   serial: "812530059c"
   mac_eth0: 00:E0:81:B2:C0:DA
@@ -1511,10 +1511,10 @@ griffon-54:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:52:05
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:04:52:06
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-55:
   serial: "812530060"
   mac_eth0: 00:E0:81:B2:C2:88
@@ -1539,10 +1539,10 @@ griffon-55:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:85
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:86
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-56:
   serial: "812530061"
   mac_eth0: 00:E0:81:B2:C1:DC
@@ -1567,10 +1567,10 @@ griffon-56:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:6d
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:6e
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-57:
   serial: "812530062"
   mac_eth0: 00:E0:81:B2:BF:EC
@@ -1595,10 +1595,10 @@ griffon-57:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:3d
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:3e
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-58:
   serial: "812530063"
   mac_eth0: 00:E0:81:B2:C0:28
@@ -1623,10 +1623,10 @@ griffon-58:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:9d
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:9e
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-59:
   serial: "812530064"
   mac_eth0: 00:E0:81:B2:C1:F8
@@ -1651,10 +1651,10 @@ griffon-59:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:31
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:32
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-60:
   serial: "812530065"
   mac_eth0: 00:E0:81:B2:BF:F4
@@ -1679,10 +1679,10 @@ griffon-60:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:41
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:42
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-61:
   serial: "812530066"
   mac_eth0: 00:E0:81:B2:C1:E2
@@ -1707,10 +1707,10 @@ griffon-61:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:05
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:06
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-62:
   serial: "812530067"
   mac_eth0: 00:E0:81:B2:C1:D6
@@ -1735,10 +1735,10 @@ griffon-62:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:5d
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:5e
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-63:
   serial: "812530068"
   mac_eth0: 00:E0:81:B1:C3:84
@@ -1763,10 +1763,10 @@ griffon-63:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b5
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b6
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-64:
   serial: "812530069"
   mac_eth0: 00:E0:81:B2:C2:48
@@ -1791,10 +1791,10 @@ griffon-64:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:13
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:30:14
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-65:
   serial: "812530070"
   mac_eth0: 00:E0:81:B1:C4:D4
@@ -1819,10 +1819,10 @@ griffon-65:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:51
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:52
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-66:
   serial: "812530071"
   mac_eth0: 00:E0:81:B2:C0:2E
@@ -1847,10 +1847,10 @@ griffon-66:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:69
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:6a
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-67:
   serial: "812530072"
   mac_eth0: 00:E0:81:B2:BF:F2
@@ -1875,10 +1875,10 @@ griffon-67:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:dd
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:de
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-68:
   serial: "812530073"
   mac_eth0: 00:E0:81:B2:C1:70
@@ -1903,10 +1903,10 @@ griffon-68:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:59
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:5a
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-69:
   serial: "812530074"
   mac_eth0: 00:E0:81:B2:C1:3A
@@ -1931,10 +1931,10 @@ griffon-69:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b1
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:b2
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-70:
   serial: "812530075"
   mac_eth0: 00:E0:81:B2:BF:8A
@@ -1959,10 +1959,10 @@ griffon-70:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:11
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:12
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-71:
   serial: "812530076"
   mac_eth0: 00:E0:81:B2:BF:CE
@@ -1987,10 +1987,10 @@ griffon-71:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:25
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:26
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-72:
   serial: "812530077"
   mac_eth0: 00:E0:81:B2:C4:D6
@@ -2015,10 +2015,10 @@ griffon-72:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:cf
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:2f:d0
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-73:
   serial: "812530078"
   mac_eth0: 00:E0:81:B2:C4:BA
@@ -2043,10 +2043,10 @@ griffon-73:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:fd
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:fe
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-74:
   serial: "812530079"
   mac_eth0: 00:E0:81:B2:C0:94
@@ -2071,10 +2071,10 @@ griffon-74:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:91
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:92
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-75:
   serial: "812530080"
   mac_eth0: 00:E0:81:B2:C1:D2
@@ -2099,10 +2099,10 @@ griffon-75:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:75
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:76
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-76:
   serial: "812530081"
   mac_eth0: 00:E0:81:B2:C1:24
@@ -2127,10 +2127,10 @@ griffon-76:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:75
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:76
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-77:
   serial: "812530082"
   mac_eth0: 00:E0:81:B2:BF:F0
@@ -2155,10 +2155,10 @@ griffon-77:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:b9
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:ba
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-78:
   serial: "812530083"
   mac_eth0: 00:E0:81:B2:C2:44
@@ -2183,10 +2183,10 @@ griffon-78:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:ad
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:17:ae
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-79:
   serial: "812530084"
   mac_eth0: 00:E0:81:B2:C4:B8
@@ -2211,15 +2211,15 @@ griffon-79:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:09
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:0a
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-80:
   serial: "812530085"
-  mac_eth0: 00:E0:81:B2:BF:EE
+  mac_eth0: 00:E0:81:B2:C1:F6
   mac_ib: C90300031800
-  mac_eth1: 00:E0:81:B2:BF:EF
+  mac_eth1: 00:E0:81:B2:C1:F7
   pdu: griffon-pdu5
   switch_eth0: sgriffon3
   switch_pos_eth0: "Gi1/0/32"
@@ -2234,15 +2234,15 @@ griffon-80:
   ip_eth1: ""
   switch_ipmi_pos: "1/0/32"
   ip_ib: 172.18.65.80
-  mac_ipmi: 00:E0:81:4F:CA:A6
+  mac_ipmi: 00:E0:81:4F:B5:AF
   bios_ver: V1.05
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:01
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:02
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-81:
   serial: "812530086"
   mac_eth0: 00:E0:81:B2:C5:72
@@ -2267,10 +2267,10 @@ griffon-81:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:61
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:62
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-82:
   serial: "812530087"
   mac_eth0: 00:E0:81:B2:C1:7E
@@ -2295,10 +2295,10 @@ griffon-82:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f9
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:fa
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-83:
   serial: "812530088"
   mac_eth0: 00:E0:81:B2:C2:40
@@ -2323,10 +2323,10 @@ griffon-83:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f5
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f6
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-84:
   serial: "812530089"
   mac_eth0: 00:E0:81:B2:C2:4E
@@ -2351,10 +2351,10 @@ griffon-84:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:0d
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:18:0e
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-85:
   serial: "812530090"
   mac_eth0: 00:E0:81:B2:C5:BC
@@ -2379,10 +2379,10 @@ griffon-85:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f1
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:19:f2
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-86:
   serial: "812530091"
   mac_eth0: 00:E0:81:B2:C2:3A
@@ -2407,10 +2407,10 @@ griffon-86:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:01
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:02
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-87:
   serial: "812530092"
   mac_eth0: 00:E0:81:B2:BF:82
@@ -2435,10 +2435,10 @@ griffon-87:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:05
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:06
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-88:
   serial: "812530093"
   mac_eth0: 00:E0:81:B2:C4:CE
@@ -2463,10 +2463,10 @@ griffon-88:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:19
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:1a
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-89:
   serial: "812530094"
   mac_eth0: 00:E0:81:B2:C5:D4
@@ -2491,10 +2491,10 @@ griffon-89:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:65
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:66
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-90:
   serial: "812530095"
   mac_eth0: 00:E0:81:B2:C0:46
@@ -2519,10 +2519,10 @@ griffon-90:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:21
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:22
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
 griffon-91:
   serial: "812530096"
   mac_eth0: 00:E0:81:B5:8F:94
@@ -2550,7 +2550,7 @@ griffon-91:
   disk_model: Hitachi HDT72103
   disk_size: "625142448"
   disk_rev: ST2O
-  disk_vend: ATA
+  disk_vend: Hitachi
 griffon-92:
   serial: "812530097"
   mac_eth0: 00:E0:81:B2:BF:DE
@@ -2575,7 +2575,7 @@ griffon-92:
   bios_release: 08/21/2009
   guidib0: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:09
   guidib1: 20:00:55:00:41:80:00:00:00:00:00:00:00:02:c9:03:00:03:1a:0a
-  disk_model: Hitachi HDP72503
+  disk_model: HDP725032GLA360
   disk_size: "625142448"
-  disk_rev: GM3O
-  disk_vend: ATA
+  disk_rev: GM3OA5CA
+  disk_vend: Hitachi
diff --git a/generators/input/nancy.rb b/generators/input/nancy.rb
index cfd601b7471deddb7e44b268572915b55a894eb0..a810219b64496881d3f93d19a7ba4a66167ddca9 100755
--- a/generators/input/nancy.rb
+++ b/generators/input/nancy.rb
@@ -10,278 +10,4 @@ site :nancy do |site_uid|
   user_support_contact "nancy-staff@lists.grid5000.fr"
   compilation_server false
 
-  cluster :griffon do |cluster_uid|
-    model "Carri System CS-5393B"
-    created_at Time.parse("2009-04-10").httpdate
-    92.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-        serial lookup('nancy-griffon', node_uid, 'serial')
-        supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
-        architecture({
-          :smp_size => 2,
-          :smt_size => 8,
-          :platform_type => "x86_64"
-          })
-        processor({
-          :vendor => "Intel",
-          :model => "Intel Xeon",
-          :version => "L5420",
-          :clock_speed => 2.5.G,
-          :instruction_set => "",
-          :other_description => "",
-          :cache_l1 => nil,
-          :cache_l1i => nil,
-          :cache_l1d => nil,
-          :cache_l2 => 12.MiB
-        })
-        main_memory({
-          :ram_size => 16.GiB,
-          :virtual_size => nil
-        })
-        operating_system({
-          :name => "Debian",
-          :release => "5.0",
-          :version => nil,
-	  :kernel => "2.6.26"
-        })
-        storage_devices [{
-          :interface => 'SATA II',
-          :size => 320.GB,
-          :driver => "ata_piix",
-	  :device => "sda",
-	  :model => lookup('nancy-griffon', node_uid, 'disk_model'),
-	  :rev => lookup('nancy-griffon', node_uid, 'disk_rev')
-        }]
-        network_adapters [{
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :device => "eth0",
-          :enabled => true,
-          :mounted => true,
-          :mountable => true,
-          :management => false,
-          :switch => lookup('nancy-griffon', "#{node_uid}", 'switch_eth0'),
-          :mac => lookup('nancy-griffon', "#{node_uid}", 'mac_eth0'),
-          :switch_port => lookup('nancy-griffon', "#{node_uid}", 'switch_pos_eth0'),
-          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          #:ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-          :ip => lookup('nancy-griffon', node_uid, 'ip_eth0'),
-          :driver => "e1000e",
-	  :vendor => "intel",
-	  :version => "80003ES2LAN"
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :enabled => false,
-          #:mounted => false,
-          :mac => lookup('nancy-griffon', "#{node_uid}", 'mac_eth1'),
-          #:mountable => false,
-          #:management => false,
-          #:driver => "e1000e",
-	  :vendor => "intel",
-	  :version => "BCM5721"
-        },
-	{
-          :interface => 'InfiniBand',
-          :rate => 20.G,
-          :device => "ib0",
-          :enabled => true,
-          :mounted => true,
-          :mountable => true,
-          :management => false,
-          :ip => lookup('nancy-griffon', "#{node_uid}", 'ip_ib'),
-          :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-	  :switch => "sgriffonib",
-          :ib_switch_card => lookup('nancy-griffon',"#{node_uid}", 'switch_ib_card'),
-          :ib_switch_card_pos => lookup('nancy-griffon',"#{node_uid}", 'switch_ib_card_pos'),
-          :driver => "mlx4_core", :vendor => "Mellanox", :version => "MT26418",
-	  :mac  => lookup('nancy-griffon', node_uid, 'guidib0')
-        },
-        {
-          :interface => 'InfiniBand',
-          :rate => 20.G,
-          :enabled => false,
-          #:mountable => false,
-          #:mounted => false,
-          #:management => false,
-          :vendor => "Mellanox",
-	  :version => "MT26418",
-	  :mac	=> lookup('nancy-griffon', node_uid, 'guidib1')
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 100.M,
-          :enabled => true,
-          :mounted => false,
-          :mountable => false,
-          :management => true,
-          :vendor => "Tyan", :version => "M3296",
-          :ip => lookup('nancy-griffon', "#{node_uid}", 'ip_ipmi'),
-          :network_address => "#{node_uid}-ipmi.#{site_uid}.grid5000.fr",
-          :switch => lookup('nancy-griffon', "#{node_uid}", 'switch_ipmi'),
-          :switch_port => lookup('nancy-griffon', "#{node_uid}", 'switch_ipmi_pos'),
-          :mac => lookup('nancy-griffon', "#{node_uid}", 'mac_ipmi'),
-        }]
-	pdu({
-	  :vendor => "American Power Conversion",
-          :pdu => lookup('nancy-griffon', "#{node_uid}", 'pdu'),
-	  :pdu_port => lookup('nancy-griffon', "#{node_uid}", 'pdu_pos')
-	})
-	bios({
-	  :version	=> lookup('nancy-griffon', node_uid, 'bios_ver'),
-	  :vendor	=> "Phoenix Technologies LTD",
-	  :release_date	=> lookup('nancy-griffon', node_uid, 'bios_release')
-	})
-      end
-    end
-  end # cluster griffon
-
-  cluster :graphene do |cluster_uid|
-    model "Carri System 5393"
-    created_at Time.parse("2011-01-20").httpdate
-
-    144.times do |i|
-      node "#{cluster_uid}-#{i+1}" do |node_uid|
-        serial lookup('nancy-graphene', node_uid, 'serial')
-        supported_job_types({:deploy => true, :besteffort => true, :virtual => "ivt"})
-        architecture({
-          :smp_size => 1,
-          :smt_size => 4,
-          :platform_type => "x86_64"
-          })
-        processor({
-          :vendor => "Intel",
-          :model => "Intel Xeon",
-          :version => "X3440",
-          :clock_speed => 2.53.G,
-          :instruction_set => "",
-          :other_description => "",
-          :cache_l1 => nil,
-          :cache_l1i => nil,
-          :cache_l1d => nil,
-          :cache_l2 => 8.MiB
-        })
-        main_memory({
-          :ram_size => 16.GiB,
-          :virtual_size => nil
-        })
-        operating_system({
-          :name => "Debian",
-          :release => "5.0",
-          :version => nil,
-          :kernel => "2.6.26"
-        })
-        storage_devices [{
-          :interface => 'SATA II',
-          :size => 320.GB,
-          :driver => "ahci",
-          :device => "sda",
-          :model => lookup('nancy-graphene', node_uid, 'disk_model'),
-          :rev => lookup('nancy-graphene', node_uid, 'disk_rev')
-        }]
-        network_adapters [{
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          :device => "eth0",
-          :enabled => true,
-          :mounted => true,
-          :mountable => true,
-          :management => false,
-          :switch => lookup('nancy-graphene', "#{node_uid}", 'switch_eth0'),
-          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_eth0'),
-          :switch_port => lookup('nancy-graphene', "#{node_uid}", 'switch_pos_eth0'),
-          :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          #:ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-          :ip => lookup('nancy-graphene', node_uid, 'ip_eth0'),
-          :driver => "e1000e",
-          :vendor => "intel",
-          :version => "82574L"
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          #:device => "eth1",
-          :enabled => false,
-          #:mounted => false,
-          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_eth1'),
-          #:management => false,
-          #:driver => "e1000e",
-          :vendor => "intel",
-          :version => "82574L"
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 1.G,
-          #:device => "eth2",
-          :enabled => false,
-          #:mounted => false,
-          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_eth2'),
-          #:management => false,
-          #:driver => "e1000e",
-          :vendor => "intel",
-          :version => "82574L"
-        },
-	{
-          :interface => 'InfiniBand',
-          :rate => 20.G,
-          :device => "ib0",
-          :enabled => true,
-          :mounted => true,
-          :mountable => true,
-          :management => false,
-          :ip => lookup('nancy-graphene', "#{node_uid}", 'ip_ib'),
-          :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-	  :switch => "sgrapheneib",
-          #:ib_switch_card => lookup('nancy',"#{node_uid}", 'switch_ib_card'),
-          #:ib_switch_card_pos => lookup('nancy',"#{node_uid}", 'switch_ib_card_pos'),
-          :driver => "mlx4_core",
-          :vendor => "Mellanox",
-          :version => "MT26418",
-	  :mac  => lookup('nancy-graphene', node_uid, 'guidib0')
-        },
-        {
-          :interface => 'InfiniBand',
-          :rate => 20.G,
-          :enabled => false,
-          #:device => "ib1",
-          #:driver => "mlx4_core",
-          :vendor => "Mellanox",
-          :version => "MT26418",
-          #:mountable => false,
-          #:mounted => false,
-          #:management => false
-          :mac	=> lookup('nancy-graphene', node_uid, 'guidib1')
-        },
-        {
-          :interface => 'Ethernet',
-          :rate => 100.M,
-          :enabled => true,
-          :mounted => false,
-          :mountable => false,
-          :management => true,
-          :vendor => "Tyan",
-          :version => "AST2050",
-          :device => "bmc",
-          :ip => lookup('nancy-graphene', "#{node_uid}", 'ip_mgt'),
-          :network_address => "#{node_uid}-bmc.#{site_uid}.grid5000.fr",
-          :switch => lookup('nancy-graphene', "#{node_uid}", 'switch_ipmi'),
-          :switch_port => lookup('nancy-graphene', "#{node_uid}", 'switch_ipmi_pos'),
-          :mac => lookup('nancy-graphene', "#{node_uid}", 'mac_mgt'),
-        }]
-        pdu({
-          :vendor => "American Power Conversion",
-          :pdu => lookup('nancy-graphene', "#{node_uid}", 'pdu'),
-          :pdu_port => lookup('nancy-graphene', "#{node_uid}", 'pdu_pos')
-        })
-        bios({
-          :version	=> lookup('nancy-graphene', node_uid, 'bios_ver'),
-          :vendor	=> "American Megatrends Inc.",
-          :release_date	=> lookup('nancy-graphene', node_uid, 'bios_release')
-        })
-
-      end
-    end
-  end # cluster graphene
-
 end