[all] Renamed a few keys

find . -iname "*.yaml" -exec sed -i 's/block_devices/storage_devices/' {} \;
find . -iname "*.yaml" -exec sed -i 's/network_interfaces/network_adapters/' {} \;
find . -iname "*.yaml" -exec sed -i 's/product_name/name/' {} \;
find . -iname "*.yaml" -exec sed -i 's/serial_number/serial/' {} \;

generators/bind/bind.rb

@@ -38,15 +38,15 @@ global_hash["sites"].each { |site_uid, site_hash|
 
     cluster_hash.fetch('nodes').each_sort_by_node_uid { |node_uid, node_hash|
 
-      network_interfaces = {}
-      node_hash.fetch('network_interfaces').each { |net_uid, net_hash|
-        network_interfaces[net_uid] = {"ip"=>net_hash["ip"], "mounted"=>net_hash["mounted"]}
+      network_adapters = {}
+      node_hash.fetch('network_adapters').each { |net_uid, net_hash|
+        network_adapters[net_uid] = {"ip"=>net_hash["ip"], "mounted"=>net_hash["mounted"]}
       }
       node_hash.fetch('kavlan').each { |net_uid, ip|
-        network_interfaces[net_uid] = {"ip"=>ip, "mounted"=>nil}
+        network_adapters[net_uid] = {"ip"=>ip, "mounted"=>nil}
       } if node_hash['kavlan']
 
-      network_interfaces.each { |net_uid, net_hash|
+      network_adapters.each { |net_uid, net_hash|
 
         entries[cluster_uid] = {}          unless entries[cluster_uid]
         entries[cluster_uid][net_uid] = [] unless entries[cluster_uid][net_uid]

generators/dhcp/dhcp.rb

@@ -10,22 +10,22 @@ global_hash = load_yaml_file_hierarchy("../../input/grid5000/")
 
 # Get the mac and ip of a node. Throw exception if error.
 def get_network_info(node_hash, network_interface)
-  # Get node_hash["network_interfaces"][network_interface]["ip"] and node_hash["network_interfaces"][network_interface]["mac"]
-  node_network_interfaces = node_hash.fetch("network_interfaces")
+  # Get node_hash["network_adapters"][network_interface]["ip"] and node_hash["network_adapters"][network_interface]["mac"]
+  node_network_adapters = node_hash.fetch("network_adapters")
   
   # For the production network, find the mounted interface (either eth0 or eth1)
   neti = network_interface
   if neti == "eth" then
-    if node_network_interfaces.fetch("eth0").fetch("mounted")
+    if node_network_adapters.fetch("eth0").fetch("mounted")
       neti = "eth0"
-    elsif node_network_interfaces.fetch("eth1").fetch("mounted")
+    elsif node_network_adapters.fetch("eth1").fetch("mounted")
       neti = "eth1"
     else
       raise 'neither eth0 nor eth1 have the property "mounted" set to "true"'
       end
   end
   
-  node_network_interface = node_network_interfaces.fetch(neti)
+  node_network_interface = node_network_adapters.fetch(neti)
   
   raise '"mac" is nil' unless node_mac = node_network_interface.fetch("mac")
   raise '"ip" is nil'  unless node_ip  = node_network_interface.fetch("ip")
@@ -35,7 +35,7 @@ end
 
 def write_dhcp_file(data)
   if data["nodes"].nil?
-    puts "Error in #{__method__}: no entry for \"#{data['filename']}\" at #{data['site_uid']} (#{data['network_interfaces']})."
+    puts "Error in #{__method__}: no entry for \"#{data['filename']}\" at #{data['site_uid']} (#{data['network_adapters']})."
     return "" 
   end
 
@@ -61,7 +61,7 @@ global_hash["sites"].each { |site_uid, site_hash|
                       "filename"            => "cluster-" + cluster_uid + ".conf",
                       "site_uid"            => site_uid,
                       "nodes"               => cluster_hash.fetch('nodes'),
-                      "network_interfaces"  => ["eth", "bmc"],
+                      "network_adapters"  => ["eth", "bmc"],
                     })
   }
   
@@ -71,7 +71,7 @@ global_hash["sites"].each { |site_uid, site_hash|
                       "filename"            => key + ".conf",
                       "site_uid"            => site_uid,
                       "nodes"               => site_hash['nodes'],
-                      "network_interfaces"  => ["eth"],
+                      "network_adapters"  => ["eth"],
                     })
   }
 

generators/dhcp/templates/dhcp.erb

@@ -5,7 +5,7 @@
 <%
   site_uid = data.fetch('site_uid')
 
-  data.fetch('network_interfaces').each { |network_interface|
+  data.fetch('network_adapters').each { |network_interface|
 %>
 group {
 <%

generators/oar-properties/lib/lib-oar-properties.rb

@@ -24,8 +24,8 @@ def get_node_properties(cluster_uid, cluster, node_uid, node)
     return h if node.size == 1 # for dead nodes, additional information is most likely missing from the ref-repository.
   end
 
-  main_network_adapter = node['network_interfaces'].values.find{ |na| na['enabled'] && na['mounted'] && na['interface'] =~ /ethernet/i && !na['management'] }
-  main_network_adapter = node['network_interfaces'].values.find{ |na| na['enabled'] && na['mounted'] }
+  main_network_adapter = node['network_adapters'].values.find{ |na| na['enabled'] && na['mounted'] && na['interface'] =~ /ethernet/i && !na['management'] }
+  main_network_adapter = node['network_adapters'].values.find{ |na| na['enabled'] && na['mounted'] }
   raise MissingProperty, "Node #{node_uid} does not have a main network_adapter" unless main_network_adapter
 
   #  h['host']            = main_network_adapter['network_address']
@@ -45,32 +45,32 @@ def get_node_properties(cluster_uid, cluster, node_uid, node)
   h['cputype']         = [node['processor']['model'], node['processor']['version']].join(' ')
   h['cpufreq']         = node['processor']['clock_speed']/1_000_000_000.0
   h['disktype']        = (node['block_devices'].first[1] || {})['interface']
-  h['ethnb']           = node['network_interfaces'].values.select{|na| na['interface'] =~ /ethernet/i}.select{|nb| nb['mounted'] == true || nb['mountable'] == true}.length
+  h['ethnb']           = node['network_adapters'].values.select{|na| na['interface'] =~ /ethernet/i}.select{|nb| nb['mounted'] == true || nb['mountable'] == true}.length
 
-  eth10g               = node['network_interfaces'].values.select{|na| na['interface'] =~ /ethernet/i}.select{|nb| nb['mounted'] == true || nb['mountable'] == true}
+  eth10g               = node['network_adapters'].values.select{|na| na['interface'] =~ /ethernet/i}.select{|nb| nb['mounted'] == true || nb['mountable'] == true}
   h['eth10g']          = eth10g.detect{|na| na['rate'] == 10_000_000_000}.nil? ? false : true
 
-  ib10g                = node['network_interfaces'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 10_000_000_000}
+  ib10g                = node['network_adapters'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 10_000_000_000}
   h['ib10g']           = ib10g ? true : false
   h['ib10gmodel']      = ib10g ? ib10g['version'] : 'none'
 
-  ib20g                = node['network_interfaces'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 20_000_000_000}
+  ib20g                = node['network_adapters'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 20_000_000_000}
   h['ib20g']           = ib20g ? true : false
   h['ib20gmodel']      = ib20g ? ib20g['version'] : 'none'
 
-  ib40g                = node['network_interfaces'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 40_000_000_000}
+  ib40g                = node['network_adapters'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 40_000_000_000}
   h['ib40g']           = ib40g ? true : false
   h['ib40gmodel']      = ib40g ? ib40g['version'] : 'none'
 
-  ib56g                = node['network_interfaces'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 56_000_000_000}
+  ib56g                = node['network_adapters'].values.detect{|na| na['interface'] =~ /infiniband/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 56_000_000_000}
   h['ib56g']           = ib56g ? true : false
   h['ib56gmodel']      = ib56g ? ib56g['version'] : 'none'
 
-  myri10g              = node['network_interfaces'].values.detect{|na| na['interface'] =~ /myri/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 10_000_000_000}
+  myri10g              = node['network_adapters'].values.detect{|na| na['interface'] =~ /myri/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 10_000_000_000}
   h['myri10g']         = myri10g ? true : false
   h['myri10gmodel']    = myri10g ? myri10g['version'] : 'none'
 
-  myri2g               = node['network_interfaces'].values.detect{|na| na['interface'] =~ /myri/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 2_000_000_000}
+  myri2g               = node['network_adapters'].values.detect{|na| na['interface'] =~ /myri/i && ( na['mounted'] == true || na['mountable'] == true ) && na['rate'] == 2_000_000_000}
   h['myri2g']          = myri2g ? true : false
   h['myri2gmodel']     = myri2g ? myri2g['version'] : 'none'
 

generators/reference-api/reference-api.rb

@@ -110,14 +110,6 @@ global_hash["sites"].each do |site_uid, site|
       node["monitoring"] = {}   unless node.key?("monitoring")
       node["monitoring"]["wattmeter"] = false unless node["monitoring"].key?("wattmeter")
 
-      # Rename keys
-      node["storage_devices"] = node.delete("block_devices")
-      node["network_adapters"] = node.delete("network_interfaces")
-      if node.key?("chassis")
-        node["chassis"]["name"]   = node["chassis"].delete("product_name")
-        node["chassis"]["serial"] = node["chassis"].delete("serial_number")
-      end
-
       # Delete keys
       node["storage_devices"].keys.each { |key| 
         node["storage_devices"][key].delete("timeread")  if node["storage_devices"][key].key?("timeread")

input/example/sites/rouen/clusters/pomme/nodes/pomme-1.yml

@@ -4,7 +4,7 @@ pomme-1:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:9e:13

input/example/sites/rouen/clusters/pomme/nodes/pomme-2.yml

@@ -4,7 +4,7 @@ pomme-2:
     version: V1.35.2.2
     release_date: 04/25/2006
     vendor: Phoenix Technologies Ltd.
-  network_interfaces:
+  network_adapters:
     eth0:
       mounted: false
       mac: 00:09:3d:12:9e:13

input/example/sites/rouen/clusters/pomme/pomme.yml

@@ -25,7 +25,7 @@ nodes:
         interface: SCSI
         driver: mptspi
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         device: eth0
         rate: 1000000000

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

@@ -22,12 +22,12 @@ nodes:
       release: Wheezy
       version: "7"
       kernel: 3.2.0-4-amd64
-    block_devices:
+    storage_devices:
       sda:
         interface: SATA
         driver: ahci
         storage: HDD
-    network_interfaces:
+    network_adapters:
       eth0:
         bridged: true
         device: eth0

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

 ---
 nodes:
   adonis-1:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:11'
@@ -15,7 +15,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-2:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:12'
@@ -29,7 +29,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-3:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:13'
@@ -43,7 +43,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-4:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:14'
@@ -57,7 +57,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-5:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:15'
@@ -71,7 +71,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-6:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:16'
@@ -85,7 +85,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-7:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:17'
@@ -99,7 +99,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-8:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:18'
@@ -113,7 +113,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-9:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:19'
@@ -127,7 +127,7 @@ nodes:
       gpu_vendor: Nvidia
       gpu_model: Tesla-C1060
   adonis-10:
-    network_interfaces:
+    network_adapters:
       eth0:
         switch: gw-grenoble
         switch_port: '3:20'

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

@@ -4,7 +4,7 @@ adonis-1:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
@@ -15,7 +15,7 @@ adonis-1:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:55
@@ -51,9 +51,9 @@ adonis-1:
       mac: 00:30:48:cc:b0:58
       ip: 172.17.18.1
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   supported_job_types:
     virtual: ivt
   processor:

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

@@ -8,7 +8,7 @@ adonis-10:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:69
@@ -43,7 +43,7 @@ adonis-10:
     bmc:
       mac: 00:30:48:cc:ad:df
       ip: 172.17.18.10
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
@@ -51,9 +51,9 @@ adonis-10:
       rev: 3.0
       vendor: Western Digital
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   supported_job_types:
     virtual: ivt
   main_memory:

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

@@ -4,7 +4,7 @@ adonis-2:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
@@ -15,7 +15,7 @@ adonis-2:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:17:59
@@ -53,9 +53,9 @@ adonis-2:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   main_memory:
     ram_size: 25769803776
   processor:

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

@@ -4,7 +4,7 @@ adonis-3:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:49
@@ -39,7 +39,7 @@ adonis-3:
     bmc:
       mac: 00:30:48:cc:b5:f6
       ip: 172.17.18.3
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
@@ -53,9 +53,9 @@ adonis-3:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   processor:
     model: Intel Xeon
     cache_l1d: 32768

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

@@ -4,7 +4,7 @@ adonis-4:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
@@ -15,7 +15,7 @@ adonis-4:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:45
@@ -53,9 +53,9 @@ adonis-4:
   supported_job_types:
     virtual: ivt
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   processor:
     model: Intel Xeon
     cache_l1d: 32768

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

@@ -4,7 +4,7 @@ adonis-5:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:14:65
@@ -39,7 +39,7 @@ adonis-5:
     bmc:
       mac: 00:30:48:cc:af:61
       ip: 172.17.18.5
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
@@ -51,9 +51,9 @@ adonis-5:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   supported_job_types:
     virtual: ivt
   processor:

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

@@ -4,7 +4,7 @@ adonis-6:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:42:65
@@ -43,7 +43,7 @@ adonis-6:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
@@ -51,9 +51,9 @@ adonis-6:
       rev: 3.0
       vendor: Western Digital
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   supported_job_types:
     virtual: ivt
   main_memory:

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

@@ -4,14 +4,14 @@ adonis-7:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
       size: 251059544064
       rev: 3.0
       vendor: Western Digital
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:41
@@ -51,9 +51,9 @@ adonis-7:
     name: debian
     version: 6.0.6
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   supported_job_types:
     virtual: ivt
   main_memory:

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

@@ -8,14 +8,14 @@ adonis-8:
     kernel: 2.6.32-5-amd64
     name: debian
     version: 6.0.6
-  block_devices:
+  storage_devices:
     sda:
       model: WDC WD2502ABYS-0
       device: sda
       size: 251059544064
       rev: 3.0
       vendor: Western Digital
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:30:48:ff:ff:cc:3d:51
@@ -51,9 +51,9 @@ adonis-8:
       mac: 00:30:48:cc:b6:6d
       ip: 172.17.18.8
   chassis:
-    serial_number: "1234567890"
+    serial: "1234567890"
     manufacturer: Bull SAS
-    product_name: bullx
+    name: bullx
   supported_job_types:
     virtual: ivt
   processor:

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

@@ -4,7 +4,7 @@ adonis-9:
     version: R4222X80
     release_date: 05/20/2010
     vendor: American Megatrends Inc.
-  network_interfaces:
+  network_adapters:
     ib0:
       mounted: true
       guid: 20:00:55:00:41:80:00:00:00:00:00:00:00:25:90:ff:ff:2f:f1:49
@@ -43,7 +43,7 @@ adonis-9: