[lib] Fix in kwollector generator to not crash if a pdu has no ports

grid5000 · Feb 14, 2022 · 9030d54 · 9030d54
1 parent c17cd03
commit 9030d54
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/refrepo/gen/puppet/kwollectg5k.rb b/lib/refrepo/gen/puppet/kwollectg5k.rb
@@ -62,7 +62,7 @@ def generate_puppet_kwollectg5k(options)
       pdu.fetch('metrics', []).each {|metric|
         next if metric['source']['protocol'] != 'snmp'
         if metric['source']['id'].include?('%PORT%')
-          pdu['ports'].each {|port_uid, node_uid|
+          pdu.fetch('ports', {}).each {|port_uid, node_uid|
             if not ports_by_node.has_key?(node_uid)
               ports_by_node[node_uid] = []
             end

diff --git a/lib/refrepo/gen/puppet/templates/kwollect-pdu.erb b/lib/refrepo/gen/puppet/templates/kwollect-pdu.erb
@@ -7,7 +7,7 @@
 pdu.fetch('metrics', []).each {|metric|
   next if metric['source']['protocol'] != 'snmp'
   if metric['source']['id'].include?('%PORT%')
-    pdu['ports'].each {|port_uid, node_uid|
+    pdu.fetch('ports', {}).each {|port_uid, node_uid|
       # Map metric to node only for single PSU
       single_port = ports_by_node[node_uid].length == 1
 -%>