Updated taurus

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-1.json

@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-10.json

@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-11.json

@@ -18,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 34359738368,
+    "ram_size": 33285996544,
     "virtual_size": null
   },
   "monitoring": {
@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-12.json

@@ -18,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 34359738368,
+    "ram_size": 33285996544,
     "virtual_size": null
   },
   "monitoring": {
@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-13.json

@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-14.json

@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-15.json

@@ -18,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 34359738368,
+    "ram_size": 33285996544,
     "virtual_size": null
   },
   "monitoring": {
@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-16.json

@@ -18,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 34359738368,
+    "ram_size": 33285996544,
     "virtual_size": null
   },
   "monitoring": {
@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-2.json

@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-3.json

@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-4.json

@@ -18,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 34359738368,
+    "ram_size": 33285996544,
     "virtual_size": null
   },
   "monitoring": {
@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-5.json

@@ -18,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 34359738368,
+    "ram_size": 33285996544,
     "virtual_size": null
   },
   "monitoring": {
@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-6.json

@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-7.json

@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-8.json

@@ -18,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 34359738368,
+    "ram_size": 33285996544,
     "virtual_size": null
   },
   "monitoring": {
@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

data/grid5000/sites/lyon/clusters/taurus/nodes/taurus-9.json

@@ -18,7 +18,7 @@
     "gpu": false
   },
   "main_memory": {
-    "ram_size": 34359738368,
+    "ram_size": 33285996544,
     "virtual_size": null
   },
   "monitoring": {
@@ -178,8 +178,7 @@
       "model": "PERC H710",
       "rev": 3.13,
       "size": 598879502336,
-      "storage": "HDD",
-      "vendor": null
+      "storage": "HDD"
     }
   ],
   "supported_job_types": {

dev/input/grid5000/sites/lyon/clusters/hercule/hercule.yaml

 ---
 model: Dell C6220
-created_at: 2012-10-02
-priority: 201299
+created_at: 2012-10-02 12:00 GMT
+priority: '201299'
 kavlan: true
 queues:
   - default
@@ -35,6 +35,7 @@ nodes:
       name: debian
       release: Jessie
       version: "8.2"
+      kernel: 3.16.0-4-amd64
     storage_devices:
       sda:
         interface: SATA
@@ -63,6 +64,7 @@ nodes:
         vendor: Intel
         version: 82599EB 10-Gigabit SFI/SFP+ Network Connection
       eth2:
+        network_address: none
         enabled: true
         mountable: true
         rate: 100000000
@@ -70,6 +72,7 @@ nodes:
         vendor: Intel
         version: Intel Corporation
       eth3:
+        network_address: none
         enabled: true
         mountable: true
         rate: 100.0e+6
@@ -84,7 +87,7 @@ nodes:
         mountable: false
         management: true
     monitoring:
-      wattmeter: shared
+      wattmeter: false
     sensors:
       power:
         available: true

dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-1.yaml

@@ -8,7 +8,7 @@ hercule-1:
   bios:
     release_date: 04/26/2012
     vendor: Dell Inc.
-    version: 1.0
+    version: 1.0.21
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge C6220

dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-2.yaml

@@ -8,7 +8,7 @@ hercule-2:
   bios:
     release_date: 04/26/2012
     vendor: Dell Inc.
-    version: 1.0
+    version: 1.0.21
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge C6220

dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-3.yaml

@@ -8,7 +8,7 @@ hercule-3:
   bios:
     release_date: 04/26/2012
     vendor: Dell Inc.
-    version: 1.0
+    version: 1.0.21
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge C6220

dev/input/grid5000/sites/lyon/clusters/hercule/nodes/hercule-4.yaml

@@ -8,7 +8,7 @@ hercule-4:
   bios:
     release_date: 04/26/2012
     vendor: Dell Inc.
-    version: 1.0
+    version: 1.0.21
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge C6220

dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-1.yaml

@@ -8,7 +8,7 @@ orion-1:
   bios:
     release_date: 05/10/2012
     vendor: Dell Inc.
-    version: 1.2
+    version: 1.2.6
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R720

dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-2.yaml

@@ -8,7 +8,7 @@ orion-2:
   bios:
     release_date: 05/10/2012
     vendor: Dell Inc.
-    version: 1.2
+    version: 1.2.6
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R720

dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-3.yaml

@@ -8,7 +8,7 @@ orion-3:
   bios:
     release_date: 05/10/2012
     vendor: Dell Inc.
-    version: 1.2
+    version: 1.2.6
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R720

dev/input/grid5000/sites/lyon/clusters/orion/nodes/orion-4.yaml

@@ -8,7 +8,7 @@ orion-4:
   bios:
     release_date: 05/10/2012
     vendor: Dell Inc.
-    version: 1.2
+    version: 1.2.6
   chassis:
     manufacturer: Dell Inc.
     name: PowerEdge R720

dev/input/grid5000/sites/lyon/clusters/orion/orion.yaml

 model: Dell R720
-created_at: 2012-09-14
-priority: 201299
+created_at: 2012-09-14 12:00:00 GMT
+priority: '201299'
 kavlan: true
 queues:
   - default
@@ -97,7 +97,7 @@ nodes:
         per_outlets: true
         via:
           api:
-            metric: pdu
+            metric: power
           www: 
             url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php 
     gpu:

dev/input/grid5000/sites/lyon/clusters/orion/orion_pdu.yaml

+---
+nodes:
+  orion-1:
+    pdu:
+      uid: wattmetre
+      port: 0
+  orion-2:
+    pdu:
+      uid: wattmetre
+      port: 1
+  orion-3:
+    pdu:
+      uid: wattmetre
+      port: 2
+  orion-4:
+    pdu:
+      uid: wattmetre
+      port: 3
+  
\ No newline at end of file

dev/input/grid5000/sites/lyon/clusters/taurus/taurus.yaml

 ---
 model: Dell R720
-created_at: 2012-09-14
+created_at: 2012-09-14 12:00:00 GMT
 kavlan: true
 queues:
   - default
@@ -104,7 +104,7 @@ nodes:
         per_outlets: true
         via:
           api:
-            metric: pdu 
+            metric: power
           www:
             url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php 
 

dev/input/grid5000/sites/lyon/clusters/taurus/taurus_pdu.yaml

+---
+nodes:
+  taurus-1:
+    pdu:
+      uid: wattmetre
+      port: 83
+  taurus-10:
+    pdu:
+      uid: wattmetre
+      port: 84
+  taurus-11:
+    pdu:
+      uid: wattmetre
+      port: 85
+  taurus-12:
+    pdu:
+      uid: wattmetre
+      port: 86
+  taurus-13:
+    pdu:
+      uid: wattmetre
+      port: 87
+  taurus-14:
+    pdu:
+      uid: wattmetre
+      port: 88
+  taurus-15:
+    pdu:
+      uid: wattmetre
+      port: 89
+  taurus-16:
+    pdu:
+      uid: wattmetre
+      port: 90
+  taurus-2:
+    pdu:
+      uid: wattmetre
+      port: 91
+  taurus-3:
+    pdu:
+      uid: wattmetre
+      port: 92
+  taurus-4:
+    pdu:
+      uid: wattmetre
+      port: 93
+  taurus-5:
+    pdu:
+      uid: wattmetre
+      port: 94
+  taurus-6:
+    pdu:
+      uid: wattmetre
+      port: 95
+  taurus-7:
+    pdu:
+      uid: wattmetre
+      port: 96
+  taurus-8:
+    pdu:
+      uid: wattmetre
+      port: 97
+  taurus-9:
+    pdu:
+      uid: wattmetre
+      port: 98
+  
\ No newline at end of file