[nancy] Correct storarge device (array/hash)

459268a7 · Sebastien Badia · f5f2ea5a · 459268a7 · 459268a7 · 459268a7
Commit 459268a7 authored Jan 13, 2012 by Sebastien Badia
20 changed files
--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-1.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390003,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-10.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390012,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-100.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390102,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-101.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390103,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-102.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390104,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-103.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390105,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-104.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390106,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-105.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390107,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-106.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390108,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-107.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390109,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-108.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390110,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-109.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390111,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-11.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390013,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-110.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390112,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-111.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": "1009390113b",
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-112.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390114,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-113.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390115,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-114.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390116,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-115.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390117,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,

--- a/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
+++ b/data/grid5000/sites/nancy/clusters/graphene/nodes/graphene-116.json
@@ -112,14 +112,16 @@
    "version": "X3440"
  },
  "serial": 1009390118,
-  "storage_devices": {
-    "device": "sda",
-    "driver": "ahci",
-    "interface": "SATA II",
-    "model": "Hitachi HDS72103",
-    "rev": "JPFO",
-    "size": 298023223876.953
-  },
+  "storage_devices": [
+    {
+      "device": "sda",
+      "driver": "ahci",
+      "interface": "SATA II",
+      "model": "Hitachi HDS72103",
+      "rev": "JPFO",
+      "size": 298023223876.953
+    }
+  ],
  "supported_job_types": {
    "besteffort": true,
    "deploy": true,