summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMrRJ45 <couton@gmail.com>2015-12-17 16:06:43 +0000
committerMrRJ45 <couton@gmail.com>2015-12-17 16:06:43 +0000
commit9d2ca3d1cb51cdddef45f584aa6c98e8e600f3b6 (patch)
tree238f26cc1796a3ca51e959a80da319fdb4ff02ef /lib
parent4e23b4341cec6a1c4e7526bd3acafbe66c624fc5 (diff)
Identify Stackable Switches
Change how we identify stackable switches using the word "Unit" to identify this. This is more reliable than identifying the Model number.
Diffstat (limited to 'lib')
-rw-r--r--lib/oxidized/model/powerconnect.rb17
1 files changed, 11 insertions, 6 deletions
diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb
index ec15402..cd04766 100644
--- a/lib/oxidized/model/powerconnect.rb
+++ b/lib/oxidized/model/powerconnect.rb
@@ -14,6 +14,9 @@ class PowerConnect < Oxidized::Model
end
cmd 'show version' do |cfg|
+ if (@stackable.nil?)
+ @stackable = true if cfg.match /(U|u)nit\s/
+ end
cfg = cfg.split("\n").select { |line| not line[/Up\sTime/] }
comment cfg.join("\n") + "\n"
end
@@ -47,15 +50,17 @@ class PowerConnect < Oxidized::Model
def clean cfg
out = []
- skip_block = false
+ skip_blocks = 0
cfg.each_line do |line|
- if line.match /Up\sTime|Temperature|Power Supplies/i
- # For 34xx, 35xx, 54xx, 55xx, 62xx and 8024F we should skip this block (terminated by a blank line)
- skip_block = true if @model =~ /^(34|35)(24|48)$|^(54|55)(24|48)$|^(62)(24|48)$|^8024$/
+ # If this is a stackable switch we should skip this block of information
+ if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i and @stackable == true)
+ skip_blocks = 1
+ # Some switches have another empty line. This is identified by this line having a colon
+ skip_blocks = 2 if line.match /:/
end
# If we have lines to skip do this until we reach and empty line
- if skip_block
- skip_block = false if /\S/ !~ line
+ if skip_blocks > 0
+ skip_blocks -= 1 if /\S/ !~ line
next
end
out << line.strip