[grenoble, luon, nancy, reims, rennes] Update input format

input/grid5000/sites/grenoble/clusters/adonis/adonis.yaml

@@ -57,6 +57,4 @@ nodes:
     sensors:
       power:
         available: true
-        via:
-          pdu:
           

input/grid5000/sites/grenoble/clusters/edel/edel.yaml

@@ -23,9 +23,10 @@ nodes:
       version: 7
       kernel: 3.2.0-4-amd64
     block_devices:
-      interface: SATA
-      driver: ahci
-      storage: SSD
+      sda:
+        interface: SATA
+        driver: ahci
+        storage: SSD
     network_interfaces:
       eth0:
         bridged: true

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

@@ -17,25 +17,26 @@ nodes:
     operating_system:
       name: debian
       release: Wheezy
-      version: 7
+      version: "7"
       kernel: 3.2.0-4-amd64
     block_devices:
       sda:
         interface: SCSI
         driver: megaraid_sas
         storage: HDD
+        vendor: null
     network_interfaces:
       eth0:
         bridged: true
         device: eth0
         vendor: Intel
-        model: Intel X520 DP 1000000000b DA/SFP+ Server Adapter
+        model: Intel X520 DP 10Gb DA/SFP+ Server Adapter
       eth1:
         rate: 1000000000
         device: eth1
         bridged: false
         vendor: Intel
-        model: Intel X520 DP 1000000000b DA/SFP+ Server Adapter
+        model: Intel X520 DP 10Gb DA/SFP+ Server Adapter
       eth2:
         rate: 1000000000
         device: eth2
@@ -75,10 +76,10 @@ nodes:
         available: true
         per_outlets: true
         via:
-        api:
-          metric: pdu 
-        www: 
-          url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php 
+          api:
+            metric: pdu
+          www: 
+            url: http://wattmetre.lyon.grid5000.fr/GetWatts-json.php 
     gpu:
       gpu:  true
       gpu_count:  1

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

@@ -29,13 +29,13 @@ nodes:
         bridged: true
         device: eth0
         vendor: Intel
-        model: Intel X520 DP 1000000000b DA/SFP+ Server Adapter
+        model: Intel X520 DP 10Gb DA/SFP+ Server Adapter
       eth1:
         rate: 1000000000
         device: eth1
         bridged: false
         vendor: Intel
-        model: Intel X520 DP 1000000000b DA/SFP+ Server Adapter
+        model: Intel X520 DP 10Gb DA/SFP+ Server Adapter
       eth2:
         rate: 1000000000
         device: eth2

input/grid5000/sites/nancy/clusters/graphene/graphene.yaml

@@ -28,9 +28,10 @@ nodes:
      version: 7
      kernel: 3.2.0-4-amd64
     block_devices:
-     interface: SATA II
-     driver: ahci
-     storage: HDD
+      sda:
+        interface: SATA II
+        driver: ahci
+        storage: HDD
     network_interfaces:
       eth0:
         bridged: true
@@ -70,8 +71,5 @@ nodes:
     sensors:
       power:
         available: true
-        via:
-          pdu:
-          - uid:
   graphene-96:
     status: retired

input/grid5000/sites/nancy/clusters/graphite/graphite.yaml

@@ -77,8 +77,3 @@ nodes:
         via:
           api: 
             metric: pdu
-          pdu: 
-            - uid: 
-              port:
-            - uid:
-              port:

input/grid5000/sites/nancy/clusters/griffon/griffon.yaml

@@ -33,9 +33,6 @@ nodes:
     sensors:
       power:
         available: true
-        via:
-          pdu:
-          - uid: 
     network_interfaces:
       eth0:
         device: eth0

input/grid5000/sites/nancy/clusters/mbi/mbi.yaml

@@ -63,7 +63,6 @@ nodes:
     sensors:
       power: 
         available: false
-        via:
 
 # Retired nodes
   mbi-29:

input/grid5000/sites/reims/clusters/stremi/stremi.yaml

@@ -56,4 +56,3 @@ nodes:
         via:
           api:
             metric: pdu 
-          pdu:

input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-1.yaml

@@ -60,7 +60,7 @@ paranoia-1:
       mac: f0:4d:a2:73:cf:45
       rate: 1000000000
       enabled: false
-      mountable: false
+      #mountable: false #TODO
       mounted: false
       management: false
     eth3:

input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-2.yaml

@@ -50,7 +50,7 @@ paranoia-2:
       driver: igb
       mac: f0:4d:a2:73:cc:78
       enabled: false
-      mountable: false
+      #mountable: false #TODO
       mounted: false
       management: false
     eth3:

input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-3.yaml

@@ -18,7 +18,7 @@ paranoia-3:
       mac: f0:4d:a2:74:06:b6
       rate: 1000000000
       enabled: false
-      mountable: false
+      #mountable: false #TODO
       mounted: false
       management: false
     eth3:

input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-4.yaml

@@ -6,7 +6,7 @@ paranoia-4:
       driver: igb
       mac: f0:4d:a2:73:cf:2a
       enabled: false
-      mountable: false
+      #mountable: false #TODO
       mounted: false
       management: false
     eth0:

input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-5.yaml

@@ -9,7 +9,7 @@ paranoia-5:
       driver: igb
       mac: f0:4d:a2:73:cc:6f
       enabled: false
-      mountable: false
+      #mountable: false #TODO
       mounted: false
       management: false
     eth3:

input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-6.yaml

@@ -16,7 +16,7 @@ paranoia-6:
       driver: igb
       mac: f0:4d:a2:73:ce:22
       enabled: false
-      mountable: false
+      #mountable: false #TODO
       mounted: false
       management: false
     eth0:

input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-7.yaml

@@ -33,7 +33,7 @@ paranoia-7:
       driver: igb
       mac: f0:4d:a2:73:ca:ad
       enabled: false
-      mountable: false
+      #mountable: false #TODO
       mounted: false
       management: false
     eth3:

input/grid5000/sites/rennes/clusters/paranoia/nodes/paranoia-8.yaml

@@ -52,7 +52,7 @@ paranoia-8:
       driver: igb
       mac: f0:4d:a2:73:ce:3d
       enabled: false
-      mountable: false
+      #mountable: false #TODO
       mounted: false
       management: false
     eth0:

input/grid5000/sites/rennes/clusters/paranoia/paranoia.yaml

@@ -48,7 +48,7 @@ nodes:
         vendor: Intel
         version: 82599EB 10-Gigabit SFI/SFP+ Network Connection
       eth1:
-        rate: 10.0e+9 #10G
+        rate: null #TODO 10.0e+9 #10G
         bridged: false
         device: eth1
         vendor: Intel

input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-1.yaml

@@ -10,10 +10,6 @@ parapide-1:
       device: sda
       size: 500107862016
       rev: GK6O
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   network_interfaces:
     ib0:
       mounted: true

input/grid5000/sites/rennes/clusters/parapide/nodes/parapide-10.yaml

@@ -4,10 +4,6 @@ parapide-10:
     version: '1.14'
     release_date: 08/04/2009
     vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   network_interfaces:
     ib0:
       mounted: true