From 4059a90780913c67a591064bdaf3a8a9399fc044 Mon Sep 17 00:00:00 2001
From: Gaetan SIMO <gaetan.simo@inria.fr>
Date: Tue, 12 Jul 2011 17:33:38 +0200
Subject: [PATCH] [orsay] added gdx myri0 mac addresses.

---
 .gitignore                                    |   1 +
 .../clusters/griffon/nodes/griffon-1.json     |   4 +-
 .../clusters/griffon/nodes/griffon-10.json    |   4 +-
 .../clusters/griffon/nodes/griffon-11.json    |   4 +-
 .../clusters/griffon/nodes/griffon-12.json    |   4 +-
 .../clusters/griffon/nodes/griffon-13.json    |   4 +-
 .../clusters/griffon/nodes/griffon-14.json    |   4 +-
 .../clusters/griffon/nodes/griffon-15.json    |   4 +-
 .../clusters/griffon/nodes/griffon-16.json    |   4 +-
 .../clusters/griffon/nodes/griffon-17.json    |   4 +-
 .../clusters/griffon/nodes/griffon-18.json    |   4 +-
 .../clusters/griffon/nodes/griffon-19.json    |   4 +-
 .../clusters/griffon/nodes/griffon-2.json     |   4 +-
 .../clusters/griffon/nodes/griffon-20.json    |   4 +-
 .../clusters/griffon/nodes/griffon-21.json    |   4 +-
 .../clusters/griffon/nodes/griffon-22.json    |   4 +-
 .../clusters/griffon/nodes/griffon-23.json    |   4 +-
 .../clusters/griffon/nodes/griffon-24.json    |   4 +-
 .../clusters/griffon/nodes/griffon-25.json    |   4 +-
 .../clusters/griffon/nodes/griffon-26.json    |   4 +-
 .../clusters/griffon/nodes/griffon-27.json    |   4 +-
 .../clusters/griffon/nodes/griffon-28.json    |   4 +-
 .../clusters/griffon/nodes/griffon-29.json    |   4 +-
 .../clusters/griffon/nodes/griffon-3.json     |   4 +-
 .../clusters/griffon/nodes/griffon-30.json    |   4 +-
 .../clusters/griffon/nodes/griffon-31.json    |   4 +-
 .../clusters/griffon/nodes/griffon-32.json    |   4 +-
 .../clusters/griffon/nodes/griffon-33.json    |   4 +-
 .../clusters/griffon/nodes/griffon-34.json    |   4 +-
 .../clusters/griffon/nodes/griffon-35.json    |   4 +-
 .../clusters/griffon/nodes/griffon-36.json    |   4 +-
 .../clusters/griffon/nodes/griffon-37.json    |   4 +-
 .../clusters/griffon/nodes/griffon-38.json    |   4 +-
 .../clusters/griffon/nodes/griffon-39.json    |   4 +-
 .../clusters/griffon/nodes/griffon-4.json     |   4 +-
 .../clusters/griffon/nodes/griffon-40.json    |   4 +-
 .../clusters/griffon/nodes/griffon-41.json    |   4 +-
 .../clusters/griffon/nodes/griffon-42.json    |   4 +-
 .../clusters/griffon/nodes/griffon-43.json    |   4 +-
 .../clusters/griffon/nodes/griffon-44.json    |   4 +-
 .../clusters/griffon/nodes/griffon-45.json    |   4 +-
 .../clusters/griffon/nodes/griffon-46.json    |   4 +-
 .../clusters/griffon/nodes/griffon-47.json    |   4 +-
 .../clusters/griffon/nodes/griffon-48.json    |   4 +-
 .../clusters/griffon/nodes/griffon-49.json    |   4 +-
 .../clusters/griffon/nodes/griffon-5.json     |   4 +-
 .../clusters/griffon/nodes/griffon-50.json    |   4 +-
 .../clusters/griffon/nodes/griffon-51.json    |   4 +-
 .../clusters/griffon/nodes/griffon-52.json    |   4 +-
 .../clusters/griffon/nodes/griffon-53.json    |   4 +-
 .../clusters/griffon/nodes/griffon-54.json    |   4 +-
 .../clusters/griffon/nodes/griffon-55.json    |   4 +-
 .../clusters/griffon/nodes/griffon-56.json    |   4 +-
 .../clusters/griffon/nodes/griffon-57.json    |   4 +-
 .../clusters/griffon/nodes/griffon-58.json    |   4 +-
 .../clusters/griffon/nodes/griffon-59.json    |   4 +-
 .../clusters/griffon/nodes/griffon-6.json     |   4 +-
 .../clusters/griffon/nodes/griffon-60.json    |   4 +-
 .../clusters/griffon/nodes/griffon-61.json    |   4 +-
 .../clusters/griffon/nodes/griffon-62.json    |   4 +-
 .../clusters/griffon/nodes/griffon-63.json    |   4 +-
 .../clusters/griffon/nodes/griffon-64.json    |   4 +-
 .../clusters/griffon/nodes/griffon-65.json    |   4 +-
 .../clusters/griffon/nodes/griffon-66.json    |   4 +-
 .../clusters/griffon/nodes/griffon-67.json    |   4 +-
 .../clusters/griffon/nodes/griffon-68.json    |   4 +-
 .../clusters/griffon/nodes/griffon-69.json    |   4 +-
 .../clusters/griffon/nodes/griffon-7.json     |   4 +-
 .../clusters/griffon/nodes/griffon-70.json    |   4 +-
 .../clusters/griffon/nodes/griffon-71.json    |   4 +-
 .../clusters/griffon/nodes/griffon-72.json    |   4 +-
 .../clusters/griffon/nodes/griffon-73.json    |   4 +-
 .../clusters/griffon/nodes/griffon-74.json    |   4 +-
 .../clusters/griffon/nodes/griffon-75.json    |   4 +-
 .../clusters/griffon/nodes/griffon-76.json    |   4 +-
 .../clusters/griffon/nodes/griffon-77.json    |   4 +-
 .../clusters/griffon/nodes/griffon-78.json    |   4 +-
 .../clusters/griffon/nodes/griffon-79.json    |   4 +-
 .../clusters/griffon/nodes/griffon-8.json     |   4 +-
 .../clusters/griffon/nodes/griffon-80.json    |  10 +-
 .../clusters/griffon/nodes/griffon-81.json    |   4 +-
 .../clusters/griffon/nodes/griffon-82.json    |   4 +-
 .../clusters/griffon/nodes/griffon-83.json    |   4 +-
 .../clusters/griffon/nodes/griffon-84.json    |   4 +-
 .../clusters/griffon/nodes/griffon-85.json    |   4 +-
 .../clusters/griffon/nodes/griffon-86.json    |   4 +-
 .../clusters/griffon/nodes/griffon-87.json    |   4 +-
 .../clusters/griffon/nodes/griffon-88.json    |   4 +-
 .../clusters/griffon/nodes/griffon-89.json    |   4 +-
 .../clusters/griffon/nodes/griffon-9.json     |   4 +-
 .../clusters/griffon/nodes/griffon-90.json    |   4 +-
 .../clusters/griffon/nodes/griffon-92.json    |   4 +-
 generators/input/nancy-graphene.rb            | 149 +++++
 generators/input/nancy-griffon.rb             | 129 ++++
 generators/input/nancy-griffon.yaml           | 554 +++++++++---------
 generators/input/nancy.rb                     | 274 ---------
 96 files changed, 741 insertions(+), 736 deletions(-)
 create mode 100644 generators/input/nancy-graphene.rb
 create mode 100644 generators/input/nancy-griffon.rb

diff --git a/.gitignore b/.gitignore
index e43b0f9889..f31b3e29c9 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 da9121113b..abdd9229f9 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 3852bb3b79..98330584fe 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 3bca221f98..e839117165 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 9758139485..1f96c41936 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 804060558a..8f2dc5ff9f 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 2e6bad063c..b022dbeeca 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 94be6deb25..8bd3d36e00 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 17ec8fd9fb..3dc5929ece 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 bcbbf3ca0d..7fa2b21f1a 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 5c84cf8b52..25edf4f65d 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 88ee9f3bdf..e52d95385e 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 e97d37b65e..a9d59892ae 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 08bb605b71..cc70849dd7 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 84e5a41016..eeca8fa290 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 8810a2f90a..2d7a481471 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 bc4f80b4fd..4557d3427e 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 f4f09b049e..3ecb7bf427 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 5ddf0ebfea..02e978a841 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 9b251e7f8f..b281b7e745 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 723425fc4f..26034e8d2a 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 4f01c81891..996d3e1a22 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 ab63703495..f8afae93a3 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 f4ecc37926..58753606ec 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 ee81570aae..227bc2adf5 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 e2afb92311..60a9a46117 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 334d860f2c..251b4a3289 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 e061d06675..57b99468c9 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 5489016be4..a46fdb184f 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 518bd67a0c..048da6f524 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 07a7f4b6a8..26d585a7f8 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 62472520cb..9d3dcd6811 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 d927731e0d..629af924a2 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 d0d3b85b92..3228a42daf 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 2ece27ac61..2fc758a699 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 c8e4281afc..369f927d91 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 e92cde4db3..8d1758c967 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 32f0a48d2a..aa97c07709 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 133d808954..1f8cf3878c 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 c8012fc4af..d6d0ec9654 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 26451beebe..7f420ed399 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 0c8ed07f64..331e42305f 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 d9838f3a9e..3d8b2eb7a5 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 e30451b5da..e764a082ba 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 d4826c4a55..36fab420b2 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 16ae7bb270..f848309bc2 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 acab2ecd30..dc0b2aeb7f 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 9429744580..a9788a97ff 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 171a9fe415..4b24b407f2 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 334ab7445c..8e46c981a9 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 2c0d6d54d0..7ec323a6a4 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 439e5adff5..d5b1967731 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 55d070fdd1..c0a2418f47 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 b909648da0..d7eb4864e3 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 a3cd1b92b8..eb71104f0a 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 0919922f9e..d20f52cac8 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 8bb1da187c..81a13faee8 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 c823f4bcaf..c85266ec24 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 ffb6f14fb5..0b59a6463f 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 69986b8dba..794b000600 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 7d09a92651..fdca307d14 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 853b3faf3c..25c972340f 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 76993b3707..0690ee2123 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 d7e63aa3d6..1f38110157 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 4857682c17..82fe771ec8 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 be25d6dbdd..d54b39bd7c 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 de3b024ccf..30438d7bb5 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 a2bd78a59f..e85641a3af 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 cf7aeb0d22..350d36eff3 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 05a84a5fa5..d3c44d3cff 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 b35e7e374a..f0312594a8 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 3417891940..f8f5feabf6 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 9116ebb23a..d371f178ae 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 ee8f1a0b5e..fa95db8338 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 c0017797da..4932466a8f 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 8a8c3c184a..6baefaa10d 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 4f1ef641c9..341ed9f10c 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 48937915d3..293dc79aa5 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 c3546bb4cf..eb84e45a0d 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 9169357c74..9e0ac9c163 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 84fc7713b0..c51b043ad3 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 bbe1f574f4..2b1037735b 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 c32cbe9d8e..2f293d2e21 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 995e3f84ce..401b50f771 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 76966877f1..ef9fb4a6ab 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 dd618a4287..8311cf50ce 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 4538630b5c..fe1fa894f5 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 b8d8da87dc..b75ee1a3a7 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 ea86972a01..182e037ea7 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 e97ff1dd89..24147e9054 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 25f5b77a35..52efc45694 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 ebe3a02566..2bea9b85fb 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 0000000000..37d6f8f0d9
--- /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 0000000000..b77a9eb89f
--- /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 63bcf827de..b664947900 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 cfd601b747..a810219b64 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
-- 
GitLab