ironware.rb in oxidized-0.21.0

- old
+ new

@@ -32,10 +32,12 @@
   cmd 'show chassis' do |cfg|
     cfg.encode!("UTF-8", :invalid => :replace, :undef => :replace) #sometimes ironware returns broken encoding
     cfg.gsub! /(^((.*)Current temp(.*))$)/, '' #remove unwanted lines current temperature
     cfg.gsub! /Speed = [A-Z-]{2,6} \(\d{2,3}\%\)/, '' #remove unwanted lines Speed Fans
     cfg.gsub! /current speed is [A-Z]{2,6} \(\d{2,3}\%\)/, ''
+    cfg.gsub! /Fan \d* - STATUS: OK \D*\d*./, '' # Fix for ADX Fan speed reporting
+    cfg.gsub! /\d* deg C/, '' # Fix for ADX temperature reporting
     cfg.gsub! /([\[]*)1([\]]*)<->([\[]*)2([\]]*)(<->([\[]*)3([\]]*))*/, ''
     cfg.gsub! /\d{2}\.\d deg-C/, 'XX.X deg-C'
     if cfg.include? "TEMPERATURE"
       sc = StringScanner.new cfg
       out = ''
@@ -48,10 +50,11 @@
 
     comment cfg
   end
 
   cmd 'show flash' do |cfg|
+    cfg.gsub! /(\d+) bytes/, '' # Fix for ADX flash size
     comment cfg
   end
 
   cmd 'show module' do |cfg|
     cfg.gsub! /^((Invalid input)|(Type \?)).*$/, '' # some ironware devices are fixed config
@@ -65,10 +68,10 @@
 
   cfg :telnet do
     # match expected prompts on both older and newer
     # versions of IronWare
     username /^(Please Enter Login Name|Username):/
-    password /^(Please Enter Password |Password):/
+    password /^(Please Enter Password ?|Password):/
   end
 
   #handle pager with enable
   cfg :telnet, :ssh do
     if vars :enable