[generators/wiki] complementary commit to PR #78

Dimitri DELABROYE · Dimitri DELABROYE · commit fce33e4ba2ea · 2018-06-25T11:28:34.000+02:00
diff --git a/generators/wiki/lib/generators/hardware.rb b/generators/wiki/lib/generators/hardware.rb
@@ -71,7 +71,8 @@ def generate_totals
           interfaces = node_hash['network_adapters'].select{ |k, v|
             v['enabled'] and
             (v['mounted'] or v['mountable']) and
-            not v['management']
+            not v['management'] and
+            (k =~ /\./).nil? # exclude PKEY / VLAN interfaces see #9417
           }.map{ |k, v|
             [
               {
@@ -91,7 +92,8 @@ def generate_totals
           interfaces = node_hash['network_adapters'].select{ |k, v|
             v['enabled'] and
             (v['mounted'] or v['mountable']) and
-            not v['management']
+            not v['management'] and
+            (k =~ /\./).nil? # exclude PKEY / VLAN interfaces see #9417
           }.map{ |k, v|
             t = (v['vendor'] || 'N/A') + ' ' + (v['model'] || 'N/A');
             [

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,8 @@ def generate_totals`
`71`	`71`	`interfaces = node_hash['network_adapters'].select{ \|k, v\|`
`72`	`72`	`v['enabled'] and`
`73`	`73`	`(v['mounted'] or v['mountable']) and`
`74`		`- not v['management']`
	`74`	`+ not v['management'] and`
	`75`	`+ (k =~ /\./).nil? # exclude PKEY / VLAN interfaces see #9417`
`75`	`76`	`}.map{ \|k, v\|`
`76`	`77`	`[`
`77`	`78`	`{`
`@@ -91,7 +92,8 @@ def generate_totals`
`91`	`92`	`interfaces = node_hash['network_adapters'].select{ \|k, v\|`
`92`	`93`	`v['enabled'] and`
`93`	`94`	`(v['mounted'] or v['mountable']) and`
`94`		`- not v['management']`
	`95`	`+ not v['management'] and`
	`96`	`+ (k =~ /\./).nil? # exclude PKEY / VLAN interfaces see #9417`
`95`	`97`	`}.map{ \|k, v\|`
`96`	`98`	`t = (v['vendor'] \|\| 'N/A') + ' ' + (v['model'] \|\| 'N/A');`
`97`	`99`	`[`