[nancy] Update dev branch

generators/reference-api/reference-api.rb

@@ -106,8 +106,8 @@ global_hash["sites"].each do |site_uid, site|
       node["main_memory"] = {} unless node.key?("main_memory")
       node["main_memory"]["virtual_size"] = nil unless node["main_memory"].key?("virtual_size")
 
-#     node["monitoring"] = {}   unless node.key?("monitoring")
-#     node["monitoring"]["wattmeter"] = false unless node["monitoring"].key?("wattmeter")
+      node["monitoring"] = {}   unless node.key?("monitoring")
+      node["monitoring"]["wattmeter"] = false unless node["monitoring"].key?("wattmeter")
 
       # Rename keys
       node["storage_devices"] = node.delete("block_devices")
@@ -116,6 +116,12 @@ global_hash["sites"].each do |site_uid, site|
         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")
+        node["storage_devices"][key].delete("timewrite") if node["storage_devices"][key].key?("timewrite")
+      }
       
       # Type conversion
       node["network_adapters"].each { |key, hash| hash["rate"] = hash["rate"].to_i if hash["rate"].is_a?(Float) }
@@ -125,7 +131,7 @@ global_hash["sites"].each do |site_uid, site|
       node["storage_devices"] = node["storage_devices"].sort_by_array(["sda", "sdb", "sdc", "sdd", "sde"]).values
 
       node["network_adapters"].each { |key, hash| node["network_adapters"][key]["device"] = key; } # Add "device: ethX" within the hash
-      node["network_adapters"] = node["network_adapters"].sort_by_array(["eth0", "eth1", "eth2", "eth3", "ib0", "ib1", "ib2", "ib3", "bmc"]).values
+      node["network_adapters"] = node["network_adapters"].sort_by_array(["eth0", "eth1", "eth2", "eth3", "eth4", "eth5", "eth6", "ib0", "ib1", "ib2", "ib3", "bmc"]).values
 
       # Populate "network_address", "switch" and "switch_port" from the network equipment description for each network adapters
       node["network_adapters"].each { |network_adapter|
@@ -178,6 +184,8 @@ global_hash["sites"].each do |site_uid, site|
         node.delete("pdu")
       end
 
+      node.delete("kavlan")
+
       #pp cluster_path.join("nodes","#{node_uid}.json")
       write_json(cluster_path.join("nodes","#{node_uid}.json"), node)
     end

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

@@ -19,8 +19,6 @@ nodes:
       queues: 
         - admin
         - production
-    main_memory:
-      virtual_size: nil
     operating_system:
       release: Jessie
     block_devices:
@@ -43,7 +41,7 @@ nodes:
         vendor: Intel Corporation
         model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
       eth1:
-        rate: 10.G
+        rate: 10000000000 #10G
         enabled: false 
         mountable: false
         bridged: false
@@ -51,7 +49,7 @@ nodes:
         vendor: Intel Corporation
         model: 82599ES 10-Gigabit SFI/SFP+ Network Connection
       eth2:
-        rate: 10.G
+        rate: 10000000000 #10G
         enabled: false
         mountable: false
         bridged: false
@@ -59,7 +57,7 @@ nodes:
         vendor: Intel Corporation
         model: Ethernet 10G 2P X520 Adapter
       eth3:
-        rate: 10.G
+        rate: 10000000000 #10G
         enabled: false 
         mountable: false
         bridged: false
@@ -67,7 +65,7 @@ nodes:
         vendor: Intel Corporation
         model: Ethernet 10G 2P X520 Adapter
       eth4:
-        rate: 1.G
+        rate: 1000000000 # 1G
         enabled: false 
         mountable: false
         bridged: false
@@ -75,7 +73,7 @@ nodes:
         vendor: Intel Corporation
         model: I350 Gigabit Network Connection
       eth5:
-        rate: 1.G
+        rate: 1000000000 # 1G
         enabled: false 
         mountable: false
         bridged: false
@@ -86,14 +84,19 @@ nodes:
         enabled: true 
         mountable: true
         mounted: true
-        bridged: true
+        bridged: false
         device: ib0
         vendor: Mellanox
         model: MT27500 Family [ConnectX-3]
         switch: sgraoullyib
+        hwid: null
+        ib_switch_card: null
+        ib_switch_card_pos: null
+        ip6: null
+        mac: null
       bmc:
         interface: Ethernet
-        rate: 1.G
+        rate: 1000000000 # 1G
         enabled: true
         mounted: false
         mountable: false

input/grid5000/sites/nancy/clusters/graoully/graoully.yaml.erb

@@ -23,7 +23,7 @@ nodes:
                     24:6E:96:03:09:F8
                     24:6E:96:03:0F:50
                    )[i-1] %>
-      ib:
+      ib0:
         ip: 172.18.70.<%= i %>
       bmc:
         ip: 172.17.70.<%= i %>

input/grid5000/sites/nancy/clusters/talc/nodes/talc-1.yaml

@@ -8,11 +8,11 @@ talc-1:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
-      rev: GM3O
+      rev: A5CA
       device: sda
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   architecture:
     smp_size: 2

input/grid5000/sites/nancy/clusters/talc/nodes/talc-10.yaml

@@ -8,7 +8,7 @@ talc-10:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
-      rev: ST2O
+      rev: A3AA
       device: sda
   architecture:
     smp_size: 2
@@ -16,7 +16,7 @@ talc-10:
     platform_type: x86_64
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   processor:
     cache_l1i: 32768
@@ -38,7 +38,7 @@ talc-10:
     eth0:
       mounted: true
       enabled: true
-      rate: 1000000000
+      rate: 100000000
       mac: 00:e0:81:b2:c0:c2
       ip: 172.16.66.10
       mountable: true

input/grid5000/sites/nancy/clusters/talc/nodes/talc-100.yaml

@@ -8,11 +8,11 @@ talc-100:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
-      rev: GM3O
+      rev: A5CA
       device: sda
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   architecture:
     smp_size: 2

input/grid5000/sites/nancy/clusters/talc/nodes/talc-101.yaml

@@ -8,7 +8,7 @@ talc-101:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
-      rev: GM3O
+      rev: A5CA
       device: sda
   architecture:
     smp_size: 2
@@ -16,7 +16,7 @@ talc-101:
     platform_type: x86_64
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   processor:
     cache_l1i: 32768

input/grid5000/sites/nancy/clusters/talc/nodes/talc-102.yaml

@@ -8,11 +8,11 @@ talc-102:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
-      rev: GM3O
+      rev: A5CA
       device: sda
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   architecture:
     smp_size: 2
@@ -38,7 +38,7 @@ talc-102:
     eth0:
       mounted: true
       enabled: true
-      rate: 1000000000
+      rate: 100000000
       mac: 00:e0:81:b5:9c:92
       ip: 172.16.66.102
       mountable: true

input/grid5000/sites/nancy/clusters/talc/nodes/talc-103.yaml

@@ -8,11 +8,11 @@ talc-103:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
-      rev: GM3O
+      rev: A5CA
       device: sda
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   architecture:
     smp_size: 2
@@ -38,7 +38,7 @@ talc-103:
     eth0:
       mounted: true
       enabled: true
-      rate: 1000000000
+      rate: 100000000
       mac: 00:e0:81:b5:56:96
       ip: 172.16.66.103
       mountable: true

input/grid5000/sites/nancy/clusters/talc/nodes/talc-104.yaml

@@ -8,7 +8,7 @@ talc-104:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
-      rev: GM3O
+      rev: A5CA
       device: sda
   architecture:
     smp_size: 2
@@ -16,7 +16,7 @@ talc-104:
     platform_type: x86_64
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   processor:
     cache_l1i: 32768
@@ -38,7 +38,7 @@ talc-104:
     eth0:
       mounted: true
       enabled: true
-      rate: 1000000000
+      rate: 100000000
       mac: 00:e0:81:b5:9c:48
       ip: 172.16.66.104
       mountable: true

input/grid5000/sites/nancy/clusters/talc/nodes/talc-105.yaml

@@ -8,7 +8,7 @@ talc-105:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
-      rev: ST2O
+      rev: A31B
       device: sda
   architecture:
     smp_size: 2
@@ -16,7 +16,7 @@ talc-105:
     platform_type: x86_64
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   processor:
     cache_l1i: 32768
@@ -38,7 +38,7 @@ talc-105:
     eth0:
       mounted: true
       enabled: true
-      rate: 1000000000
+      rate: 100000000
       mac: 00:e0:81:b5:9b:a2
       ip: 172.16.66.105
       mountable: true

input/grid5000/sites/nancy/clusters/talc/nodes/talc-106.yaml

@@ -8,11 +8,11 @@ talc-106:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
-      rev: GM3O
+      rev: A5CA
       device: sda
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   architecture:
     smp_size: 2
@@ -38,7 +38,7 @@ talc-106:
     eth0:
       mounted: true
       enabled: true
-      rate: 1000000000
+      rate: 100000000
       mac: 00:e0:81:b8:b7:ee
       ip: 172.16.66.106
       mountable: true

input/grid5000/sites/nancy/clusters/talc/nodes/talc-107.yaml

@@ -8,7 +8,7 @@ talc-107:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
-      rev: ST2O
+      rev: A31B
       device: sda
   architecture:
     smp_size: 2
@@ -16,7 +16,7 @@ talc-107:
     platform_type: x86_64
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   processor:
     cache_l1i: 32768
@@ -38,7 +38,7 @@ talc-107:
     eth0:
       mounted: true
       enabled: true
-      rate: 1000000000
+      rate: 100000000
       mac: 00:e0:81:b1:c4:76
       ip: 172.16.66.107
       mountable: true

input/grid5000/sites/nancy/clusters/talc/nodes/talc-108.yaml

@@ -8,11 +8,11 @@ talc-108:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
-      rev: ST2O
+      rev: A31B
       device: sda
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   architecture:
     smp_size: 2
@@ -38,7 +38,7 @@ talc-108:
     eth0:
       mounted: true
       enabled: true
-      rate: 1000000000
+      rate: 100000000
       mac: 00:e0:81:b1:c0:12
       ip: 172.16.66.108
       mountable: true

input/grid5000/sites/nancy/clusters/talc/nodes/talc-109.yaml

@@ -8,7 +8,7 @@ talc-109:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
-      rev: ST2O
+      rev: A31B
       device: sda
   architecture:
     smp_size: 2
@@ -16,7 +16,7 @@ talc-109:
     platform_type: x86_64
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   processor:
     cache_l1i: 32768

input/grid5000/sites/nancy/clusters/talc/nodes/talc-11.yaml

@@ -8,7 +8,7 @@ talc-11:
     sda:
       size: 320072933376
       model: Hitachi HDP72503
-      rev: GM3O
+      rev: A5CA
       device: sda
   architecture:
     smp_size: 2
@@ -16,7 +16,7 @@ talc-11:
     platform_type: x86_64
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   processor:
     cache_l1i: 32768
@@ -38,8 +38,8 @@ talc-11:
     eth0:
       mounted: true
       enabled: true
-      rate: 1000000000
-      mac: 
+      rate: 100000000
+      mac: 00:e0:81:b1:bf:82
       ip: 172.16.66.11
       mountable: true
       driver: e1000e

input/grid5000/sites/nancy/clusters/talc/nodes/talc-110.yaml

@@ -8,11 +8,11 @@ talc-110:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
-      rev: ST2O
+      rev: A3AA
       device: sda
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   architecture:
     smp_size: 2
@@ -38,7 +38,7 @@ talc-110:
     eth0:
       mounted: true
       enabled: true
-      rate: 1000000000
+      rate: 100000000
       mac: 00:e0:81:b1:bf:96
       ip: 172.16.66.110
       mountable: true

input/grid5000/sites/nancy/clusters/talc/nodes/talc-111.yaml

@@ -8,7 +8,7 @@ talc-111:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
-      rev: ST2O
+      rev: A31B
       device: sda
   architecture:
     smp_size: 2
@@ -16,7 +16,7 @@ talc-111:
     platform_type: x86_64
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   processor:
     cache_l1i: 32768
@@ -38,7 +38,7 @@ talc-111:
     eth0:
       mounted: true
       enabled: true
-      rate: 1000000000
+      rate: 100000000
       mac: 00:e0:81:b1:c0:9c
       ip: 172.16.66.111
       mountable: true

input/grid5000/sites/nancy/clusters/talc/nodes/talc-112.yaml

@@ -8,7 +8,7 @@ talc-112:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
-      rev: ST2O
+      rev: A31B
       device: sda
   architecture:
     smp_size: 2
@@ -16,7 +16,7 @@ talc-112:
     platform_type: x86_64
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   processor:
     cache_l1i: 32768
@@ -38,7 +38,7 @@ talc-112:
     eth0:
       mounted: true
       enabled: true
-      rate: 1000000000
+      rate: 100000000
       mac: 00:e0:81:b1:c4:46
       ip: 172.16.66.112
       mountable: true

input/grid5000/sites/nancy/clusters/talc/nodes/talc-113.yaml

@@ -8,11 +8,11 @@ talc-113:
     sda:
       size: 320072933376
       model: Hitachi HDT72103
-      rev: ST2O
+      rev: A31B
       device: sda
   operating_system:
     kernel: 3.2.0-4-amd64
-    version: 7.2
+    version: 8.2
     name: debian
   architecture:
     smp_size: 2
@@ -38,7 +38,7 @@ talc-113:
     eth0:
       mounted: true
       enabled: true
-      rate: 1000000000
+      rate: 100000000
       mac: 00:e0:81:b1:c4:5e
       ip: 172.16.66.113
       mountable: true