diff options
author | Saku Ytti <saku@ytti.fi> | 2015-04-16 19:00:09 +0300 |
---|---|---|
committer | Saku Ytti <saku@ytti.fi> | 2015-04-16 19:00:09 +0300 |
commit | c73563d4c517e35b1bcb3a26f2c236a37aa4ff1a (patch) | |
tree | 3a1f9b178efdaa88375c7b14c9e39ee39e392c8c | |
parent | 1fcc6ec83d1bc9f45bc13da243787abb846c55e7 (diff) | |
parent | 333af10d117cd925bba941c106ed1d646b944ed4 (diff) |
Merge branch 'master' of https://github.com/ytti/oxidized
-rw-r--r-- | lib/oxidized/model/powerconnect.rb | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb index 531ad0b..0b28f37 100644 --- a/lib/oxidized/model/powerconnect.rb +++ b/lib/oxidized/model/powerconnect.rb @@ -4,7 +4,7 @@ class PowerConnect < Oxidized::Model comment '! ' - expect /^\s--More--\s+.*$/ do |data, re| + expect /^\s*--More--\s+.*$/ do |data, re| send ' ' data.sub re, '' end @@ -50,8 +50,8 @@ class PowerConnect < Oxidized::Model skip_block = false cfg.each_line do |line| if line.match /Up\sTime|Temperature|Power Supplies/i - # For 34xx, 54xx, 55xx, 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)$|^8024$/ + # 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$/ end # If we have lines to skip do this until we reach and empty line if skip_block @@ -64,5 +64,4 @@ class PowerConnect < Oxidized::Model out << "\n" end - end |