From ec75512455d6a713079b8a20de1c87bfe8d17d8e Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Thu, 16 Apr 2015 16:28:34 +0200 Subject: Add support for PowerConnect 62xx The pager prompt on the PowerConnect 62xx family does not have a leading space; fixed the expect regex. Also added 6224/6248 to the block ignore regex. --- lib/oxidized/model/powerconnect.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lib/oxidized') 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 -- cgit v1.2.1