Commit 53c32364 authored by Pascal Morillon's avatar Pascal Morillon

[admin] fixes bug with ethnb OAR property

parent 13db801d
......@@ -21,8 +21,8 @@ module Grid5000
h['cluster'] = cluster.properties['uid']
h['nodemodel'] = cluster.properties['model']
h['switch'] = main_network_adapter['switch']
h['besteffort'] = properties['supported_job_types']['besteffort'] ? "YES" : "NO"
h['deploy'] = properties['supported_job_types']['deploy'] ? "YES" : "NO"
#h['besteffort'] = properties['supported_job_types']['besteffort'] ? "YES" : "NO"
#h['deploy'] = properties['supported_job_types']['deploy'] ? "YES" : "NO"
h['ip_virtual'] = properties['supported_job_types']['virtual'] ? "YES" : "NO"
h['virtual'] = properties['supported_job_types']['virtual']
h['cpuarch'] = properties['architecture']['platform_type']
......@@ -30,7 +30,7 @@ module Grid5000
h['cputype'] = [properties['processor']['model'], properties['processor']['version']].join(" ")
h['cpufreq'] = properties['processor']['clock_speed']/1_000_000_000
h['disktype'] = (properties['storage_devices'].first || {})['interface']
h['ethnb'] = properties["network_adapters"].select{|na| na['interface'] =~ /ethernet/i}.length
h['ethnb'] = properties["network_adapters"].select{|na| na['interface'] =~ /ethernet/i}.select{|nb| nb['mountable'] == true}.length
ib10g = properties['network_adapters'].detect{|na| na['interface'] =~ /infiniband/i && na['rate'] == 10_000_000_000}
h['ib10g'] = ib10g.nil? ? "NO" : "YES"
h['ib10gmodel'] = ib10g.nil? ? "none" : ib10g['version']
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment