Merge branch 'wiki_network_sriov' into 'master'

[wiki] Add SR-IOV information and improve network tables

See merge request grid5000/reference-repository!269

Author: jonglezb

lib/refrepo/gen/wiki/generators/hardware.rb

@@ -160,14 +160,18 @@ def generate_totals
                   text: v['interface'],
                   sort: v['interface']
                 },
+                {
+                  text: v['driver'], sort: v['driver']
+                },
                 {
                   text: t, sort: t
                 }
               ]
             }.uniq
 
             net_models = interfaces.inject(Hash.new(0)){ |h, v| h[v] += 1; h }
-            net_models.sort_by { |k, v|  k.first[:sort] }.each { |k, v|
+            # Sort by interface type (eth or IB) and then by driver
+            net_models.sort_by { |k, v|  [k.first[:sort], k[1][:sort]] }.each { |k, v|
               init(data, 'net_models', k)
               data['net_models'][k][site_uid] += v
             }
@@ -280,8 +284,11 @@ def generate_totals
     generated_content += "\n== Nodes with several Ethernet interfaces ==\n"
     generated_content +=  generate_interfaces
 
+    generated_content += "\n== Nodes with SR-IOV support ==\n"
+    generated_content +=  generate_sriov_interfaces
+
     generated_content += "\n== Network interface models ==\n"
-    table_columns = ['Type', 'Model'] + sites + ['Cards total']
+    table_columns = ['Type', 'Driver', 'Model'] + sites + ['Cards total']
     generated_content += MW.generate_table(table_options, table_columns, get_table_data(data, 'net_models'))
 
     generated_content += "\n= Storage ="
@@ -458,7 +465,7 @@ def generate_interfaces
             interfaces['25g_count'] = node_interfaces.select { |v| v['rate'] == 25_000_000_000 }.count
             interfaces['10g_count'] = node_interfaces.select { |v| v['rate'] == 10_000_000_000 }.count
             interfaces['1g_count'] = node_interfaces.select { |v| v['rate'] == 1_000_000_000 }.count
-            interfaces['details'] = node_interfaces.map{ |v| v['device'] + (v['name'].nil? ? '' : '/' + v['name'])  + ' (' + G5K.get_rate(v['rate']) + ')' }.sort.join(', ')
+            interfaces['details'] = node_interfaces.map{ |v| v['name'] + ' (' + G5K.get_rate(v['rate']) + ')' }.sort.join(', ')
             queues = cluster_hash['queues'] - ['admin', 'default', 'testing']
             interfaces['queues'] = (queues.nil? || (queues.empty? ? '' : queues[0] + G5K.pluralize(queues.count, ' queue')))
             interface_add(network_interfaces, node_uid, interfaces) if node_interfaces.count > 1
@@ -489,6 +496,49 @@ def generate_interfaces
     MW.generate_table(table_options, table_columns, table_data)
   end
 
+  def generate_sriov_interfaces
+    table_data = []
+    @global_hash["sites"].sort.to_h.each { |site_uid, site_hash|
+      site_hash.fetch("clusters").sort.to_h.each { |cluster_uid, cluster_hash|
+        network_interfaces = {}
+        cluster_hash.fetch('nodes').sort.to_h.each { |node_uid, node_hash|
+          next if node_hash['status'] == 'retired'
+          if node_hash['network_adapters']
+            node_interfaces = node_hash['network_adapters'].select{ |v|
+              v['sriov'] and
+              v['enabled'] == true and
+              (v['mounted'] == true or v['mountable'] == true) and
+              v['management'] == false
+            }
+
+            interfaces = {}
+            interfaces['details'] = node_interfaces.map{ |v| v['name'] + " (#{v['sriov_totalvfs']} VFs)" }.sort.join(', ')
+            interfaces['vfs_sum'] = node_interfaces.map{ |v| v['sriov_totalvfs'] }.sum
+            interface_add(network_interfaces, node_uid, interfaces) if node_interfaces.count > 0
+          end
+        }
+
+        # One line for each group of nodes with the same interfaces
+        network_interfaces.sort.to_h.each { |num, interfaces|
+          table_data << [
+            "[[#{site_uid.capitalize}:Network|#{site_uid.capitalize}]]",
+            "[[#{site_uid.capitalize}:Hardware##{cluster_uid}" + "|#{cluster_uid}" + (network_interfaces.size==1 ? '' : '-' + G5K.nodeset(num)) + "]]",
+            num.count,
+            "data-sort-value=\"#{interfaces['vfs_sum']}\"|#{interfaces['details']}"
+          ]
+        }
+      }
+    }
+    # Sort by site and cluster name
+    table_data.sort_by! { |row|
+      [row[0], row[1]]
+    }
+
+    table_options = 'class="wikitable sortable" style="text-align: center;"'
+    table_columns = ["Site", "Cluster", "Nodes", "Interfaces (max number of Virtual Functions)"]
+    MW.generate_table(table_options, table_columns, table_data)
+  end
+
   # This methods adds the array interfaces to the hash
   # network_interfaces. If nodes 2,3,7 have the same interfaces, they
   # will be gathered in the same key and we will have

lib/refrepo/gen/wiki/generators/site_hardware.rb

@@ -344,6 +344,7 @@ def get_hardware(sites)
         }.map{|v| {
             'rate' => v['rate'],
             'interface' => v['interface'],
+            'sriov' => v['sriov'],
             'used' => (v['enabled'] and (v['mounted'] or v['mountable']))
           }
         }
@@ -356,6 +357,7 @@ def get_hardware(sites)
         }.map{ |e|
           get_network_info(e, false)
         }.join('+ ')
+        hard['used_networks'] += ', SR-IOV available' if network.any? { |e| e['sriov'] }
 
         hard['network_throughput'] = network.select { |e|
           e['used'] == true
@@ -373,6 +375,7 @@ def get_hardware(sites)
             'rate' => v['rate'],
             'interface' => v['interface'],
             'driver' => v['driver'],
+            'sriov' => v['sriov'],
             'unwired' => v['enabled'] == false,
             'unavailable_for_experiment' => v['mountable'] == false,
             'no_kavlan' => (v['interface'] == 'Ethernet' &&
@@ -386,33 +389,34 @@ def get_hardware(sites)
         }
         nic_c = 0
         hard['network_description'] = network_description.map do |e|
-          s  = e['count'] > 1 ? "\n* " : ''
-          s += e['unavailable_for_experiment'] ? '<span style="color:grey">' : ''
+          desc = []
           if e['name'].nil? or e['name'] == e['device']
-            s += e['device']
+            desc.append(e['device'])
           else
-            s +=  e['device'] + "/" + e['name']
+            desc.append(e['device'] + "/" + e['name'])
           end
-          s += ', '
-          s += e['interface']
-          s += ', '
+          desc.append(e['interface'])
+
           if !(e['unwired'] and e['unavailable_for_experiment'])
-            s += 'configured rate: ' + (e['unwired'] ? 'n/c' : G5K.get_rate(e['rate']))
-            s += ', '
+            desc.append('configured rate: ' + (e['unwired'] ? 'n/c' : G5K.get_rate(e['rate'])))
           end
           if !(e['model'] == 'N/A N/A' and e['unavailable_for_experiment']) # don't include interface model if not available
             e['model'] = 'N/A' if e['model'] == 'N/A N/A'
-            s += 'model: '+ e['model'] + ', '
+            desc.append('model: '+ e['model'])
           end
-          s +=  'driver: ' + e['driver'] if e['driver']
-          if e['unavailable_for_experiment']
-            s += ' - unavailable for experiment'
+          desc.append('driver: ' + e['driver']) if e['driver']
+          desc.append('SR-IOV enabled') if e['sriov'] and not e['unavailable_for_experiment']
+          # Generate final string and then adjust
+          s = desc.join(', ')
+          if e['no_kavlan']
+            s += ' - no KaVLAN'
+          elsif e['unavailable_for_experiment']
+            s = '<span style="color:grey">' + s + ' - unavailable for experiment</span>'
           elsif e['device'] =~ /eth/
-            s += ' [[Advanced_KaVLAN#A_simple_multi_NICs_example|(multi NICs example)]]' if !nic_c.zero? and not e.fetch('no_kavlan')
+            s += ' [[Advanced_KaVLAN#A_simple_multi_NICs_example|(multi NICs example)]]' if !nic_c.zero?
             nic_c += 1
           end
-          s += ' - no KaVLAN' if e['no_kavlan']
-          s +=  e['unavailable_for_experiment'] ? '</span>' : ''
+          s = "\n* " + s
           s
         end.join('<br />')