[grenoble] update input files

generators/lib/hash/hash.rb

@@ -84,7 +84,7 @@ class ::Hash
     }
   end
 
-  # sort a hash according to the position of the key in the array
+  # sort a hash according to the position of the key in the array.
   def sort_by_array(array)
     Hash[sort_by{|key, _| array.index(key) || length}] 
   end

generators/reference-api/reference-api.rb

@@ -120,6 +120,7 @@ global_hash["sites"].each do |site_uid, site|
 
       # Populate "network_address", "switch" and "switch_port" from the network equipment description for each network adapters
       node["network_adapters"].each { |network_adapter|
+        network_adapter["mac"] = network_adapter["mac"].downcase if network_adapter["mac"].is_a?(String)
 
         # ib properties
         network_adapter["ib_switch_card"]     = network_adapter.delete("line_card") if network_adapter.key?("line_card")

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

@@ -3,7 +3,9 @@
 model: Bull R422-E2 dual mobo + Tesla S1070
 created_at: 2010-09-02
 kavlan: true
-production: true
+queues:
+  - default
+  - admin
 
 nodes:
 

input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-1.yaml

@@ -11,10 +11,6 @@ adonis-1:
       size: 251059544064
       rev: 3.0
       vendor: Western Digital
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   network_adapters:
     ib0:
       mounted: true

input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-10.yaml

@@ -4,10 +4,6 @@ adonis-10:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   network_adapters:
     ib0:
       mounted: true

input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-2.yaml

@@ -11,10 +11,6 @@ adonis-2:
       size: 251059544064
       rev: 3.0
       vendor: Western Digital
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   network_adapters:
     ib0:
       mounted: true

input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-3.yaml

@@ -46,10 +46,6 @@ adonis-3:
       size: 251059544064
       rev: 3.0
       vendor: Western Digital
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   supported_job_types:
     virtual: ivt
   chassis:

input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-4.yaml

@@ -11,10 +11,6 @@ adonis-4:
       size: 251059544064
       rev: 3.0
       vendor: Western Digital
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   network_adapters:
     ib0:
       mounted: true

input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-5.yaml

@@ -46,10 +46,6 @@ adonis-5:
       size: 251059544064
       rev: 3.0
       vendor: Western Digital
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   chassis:
     serial: "1234567890"
     manufacturer: Bull SAS

input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-6.yaml

@@ -39,10 +39,6 @@ adonis-6:
     bmc:
       mac: 00:30:48:cc:ad:f2
       ip: 172.17.18.6
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   storage_devices:
     sda:
       model: WDC WD2502ABYS-0

input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-7.yaml

@@ -46,10 +46,6 @@ adonis-7:
     bmc:
       mac: 00:30:48:cc:b5:e4
       ip: 172.17.18.7
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   chassis:
     serial: "1234567890"
     manufacturer: Bull SAS

input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-8.yaml

@@ -4,10 +4,6 @@ adonis-8:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   storage_devices:
     sda:
       model: WDC WD2502ABYS-0

input/grid5000/sites/grenoble/clusters/adonis/nodes/adonis-9.yaml

@@ -39,10 +39,6 @@ adonis-9:
     bmc:
       mac: 00:25:90:4b:bd:b1
       ip: 172.17.18.9
-  operating_system:
-    kernel: 2.6.32-5-amd64
-    name: debian
-    version: 6.0.6
   storage_devices:
     sda:
       model: WDC WD2502ABYS-0

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

@@ -3,7 +3,9 @@
 model: Bull bullx B500 compute blades
 created_at: 2008-10-03
 kavlan: true
-production: true
+queues:
+  - default
+  - admin
 
 nodes:
 

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

@@ -3,7 +3,9 @@
 model: Bull R422-E1
 created_at: 2008-10-01
 kavlan: true
-production: true
+queues:
+  - default
+  - admin
 
 nodes:
 

input/grid5000/sites/grenoble/grenoble.yaml

@@ -14,4 +14,6 @@ compilation_server: false
 kavlan_ip_range: 10.4.0.0/14
 virt_ip_range: 10.132.0.0/14
 storage5k: false
-production: true
+queues:
+  - default
+  - admin

input/grid5000/sites/grenoble/pdus.rb

-site :grenoble do |site_uid|
-
-  2.times do |i|
-    pdu "adonis-pdu-#{i+1}" do |pdu_uid|
-      vendor "Eaton Corporation"
-      model "ePDU C20 16A"
-      sensors [
-        {
-          :power => {
-            :per_outlets => true,
-            :snmp => {
-              :available => true,
-              :total_oids => ["iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.1", "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0.2"],
-              :unit => "W",
-              :outlet_prefix_oid => "iso.3.6.1.4.1.534.6.6.7.5.5.1.3.0"
-            }
-          }
-        }
-      ]
-    end
-  end
-end
-

input/grid5000/sites/lille/clusters/chimint/chimint.yaml

@@ -2,7 +2,9 @@
 model: Dell PowerEdge R410
 created_at: 2011-03-25
 kavlan: true
-production: true
+queues:
+  - default
+  - admin
 
 nodes:
 

input/grid5000/sites/lille/clusters/chinqchint/chinqchint.yaml

 model: Altix Xe 310
 created_at: 2007-09-10
 kavlan: true
-production: true
+queues:
+  - default
+  - admin
 
 nodes:
 

input/grid5000/sites/lille/clusters/chirloute/chirloute.yaml

@@ -2,7 +2,9 @@ model: Dell PowerEdge C6100
 created_at: 2011-03-25
 priority: 201199
 kavlan: true
-production: true
+queues:
+  - default
+  - admin
 
 nodes:
   chirloute-[1-8]: