oxidized 0.19.0 → 0.20.0

data/lib/oxidized/model/ironware.rb

@@ -30,10 +30,11 @@ class IronWare < Oxidized::Model
   end
 
   cmd 'show chassis' do |cfg|
-    cfg.encode!("UTF-8", :invalid => :replace) #sometimes ironware returns broken encoding
+    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! /([\[]*)1([\]]*)<->([\[]*)2([\]]*)(<->([\[]*)3([\]]*))*/, ''
     cfg.gsub! /\d{2}\.\d deg-C/, 'XX.X deg-C'
     if cfg.include? "TEMPERATURE"
       sc = StringScanner.new cfg
@@ -66,23 +67,21 @@ class IronWare < Oxidized::Model
     # match expected prompts on both older and newer
     # versions of IronWare
     username /^(Please Enter Login Name|Username):/
-    password /^(Please Enter )Password:/
+    password /^(Please Enter Password |Password):/
   end
 
   #handle pager with enable
   cfg :telnet, :ssh do
     if vars :enable
       post_login do
-        send "enable\r\n"
+        send "enable\n"
         cmd vars(:enable)
       end
     end
     post_login ''
     post_login 'skip-page-display'
     post_login 'terminal length 0'
-    pre_logout 'logout'
-    pre_logout 'exit'
-    pre_logout 'exit'
+    pre_logout "logout\nexit\nexit\n"
   end
 
 end

data/lib/oxidized/model/junos.rb

@@ -8,6 +8,7 @@ class JunOS < Oxidized::Model
 
   cmd :all do |cfg|
     cfg = cfg.lines.to_a[1..-2].join if screenscrape
+    cfg.gsub!(/  scale-subscriber (\s+)(\d+)/,'  scale-subscriber                <count>')
     cfg.lines.map { |line| line.rstrip }.join("\n") + "\n"
   end
 
@@ -36,6 +37,8 @@ class JunOS < Oxidized::Model
   end
 
   cmd('show chassis hardware') { |cfg| comment cfg }
+  cmd('show system license') { |cfg| comment cfg }
+  cmd('show system license keys') { |cfg| comment cfg }
 
   cfg :telnet do
     username(/^login:/)

data/lib/oxidized/model/mlnxos.rb

@@ -13,6 +13,10 @@ class MLNXOS < Oxidized::Model
     cfg.gsub! /\[\?1h=\r/, '' # Pager Handling
     cfg.gsub! /\r\[K/,'' # Pager Handling
     cfg.gsub! /\s/, '' # Linebreak Handling
+    cfg.gsub! /^CPU\ load\ averages\:\s.+/, '' # Omit constantly changing CPU info
+    cfg.gsub! /^System\ memory\:\s.+/, '' # Omit constantly changing memory info
+    cfg.gsub! /^Uptime\:\s.+/, '' # Omit constantly changing uptime info
+    cfg.gsub! /.+Generated\ at\s\d+.+/, '' # Omit constantly changing generation time info
     cfg = cfg.lines.to_a[2..-3].join
   end
 
@@ -38,6 +42,6 @@ class MLNXOS < Oxidized::Model
 
   cfg :ssh do
     password /^Password:\s*/
-    pre_logout 'exit'
+    pre_logout "\nexit"
   end
 end

data/lib/oxidized/model/netgear.rb

@@ -0,0 +1,32 @@
+class Netgear < Oxidized::Model
+
+  comment '!'
+  prompt /^(\([\w-]+\)\s[#>])$/
+
+  cmd :secret do |cfg|
+    cfg.gsub!(/password (\S+)/, 'password <hidden>')
+    cfg
+  end
+
+  cfg :telnet, :ssh do
+    if vars :enable
+      post_login do
+        cmd 'enable'
+        # Interpret enable: true as meaning we won't be prompted for a password
+        unless vars(:enable).is_a? TrueClass
+          expect /[pP]assword:\s?$/
+          cmd vars(:enable) + "\n"
+        end
+        expect /^.+[#]$/
+      end
+    end
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+    pre_logout 'quit'
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg.gsub! /^(!.*Time).*$/, '\1'
+  end
+
+end

data/lib/oxidized/model/nxos.rb

@@ -3,6 +3,14 @@ class NXOS < Oxidized::Model
   prompt /^(\r?[\w.@_()-]+[#]\s?)$/
   comment '! '
 
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^(snmp-server user (\S+) (\S+) auth (\S+)) (\S+) (priv) (\S+)/, '\\1 <configuration removed> '
+    cfg.gsub! /^(username \S+ password \d) (\S+)/, '\\1 <secret hidden>'
+    cfg.gsub! /^(radius-server key).*/, '\\1 <secret hidden>'
+    cfg
+  end
+  
   cmd 'show version' do |cfg|
     cfg = cfg.each_line.take_while { |line| not line.match(/uptime/i) }
     comment cfg.join ""
@@ -16,8 +24,13 @@ class NXOS < Oxidized::Model
     cfg.gsub! /^!Time:[^\n]*\n/, ''
   end
 
-  cfg :ssh do
+  cfg :ssh, :telnet do
     post_login 'terminal length 0'
     pre_logout 'exit'
   end
+
+  cfg :telnet do
+    username /^login:/
+    password /^Password:/
+  end
 end

data/lib/oxidized/model/oneos.rb

@@ -0,0 +1,58 @@
+class OneOS < Oxidized::Model
+
+  prompt /^([\w.@()-]+#\s?)$/
+  comment  '! '
+
+  # example how to handle pager
+  #expect /^\s--More--\s+.*$/ do |data, re|
+  #  send ' '
+  #  data.sub re, ''
+  #end
+
+  # non-preferred way to handle additional PW prompt
+  #expect /^[\w.]+>$/ do |data|
+  #  send "enable\n"
+  #  send vars(:enable) + "\n"
+  #  data
+  #end
+
+  cmd :all do |cfg|
+    #cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
+    #cfg.gsub! /\cH+/, ''              # example how to handle pager
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp set-read-community ").*+?(".*)$/, '\\1<secret hidden>\\2'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg = cfg.each_line.to_a[0..-1].join
+    cfg.gsub! /^Building configuration...\s*[^\n]*\n/, ''
+    cfg.gsub! /^Current configuration :\s*[^\n]*\n/, ''
+    cfg
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    # preferred way to handle additional passwords
+    if vars :enable
+      post_login do
+        send "enable\n"
+        cmd vars(:enable)
+      end
+    end
+    post_login 'term len 0'
+    pre_logout 'exit'
+  end
+
+end

data/lib/oxidized/model/opengear.rb

@@ -1,6 +1,8 @@
 class OpenGear < Oxidized::Model
 
   comment  '# '
+  
+  prompt /^(\$\s)?$/
 
   cmd :secret do |cfg|
     cfg.gsub!(/password (\S+)/, 'password <secret removed>')

data/lib/oxidized/model/pfsense.rb

@@ -3,11 +3,12 @@ class PfSense < Oxidized::Model
   # use other use than 'admin' user, 'admin' user cannot get ssh/exec. See issue #535
   
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.each_line.to_a[1..-1].join
   end
   
   cmd 'cat /cf/conf/config.xml' do |cfg|
-    cfg.gsub! /\s<revision>\s*.*\s*<time>\d*<\/time>\s*.*\s*<\/revision>/, ''
+    cfg.gsub! /\s<revision>\s*<time>\d*<\/time>\s*.*\s*.*\s*<\/revision>/, ''
+    cfg.gsub! /\s<last_rule_upd_time>\d*<\/last_rule_upd_time>/, ''
     cfg
   end
   

data/lib/oxidized/model/powerconnect.rb

@@ -67,6 +67,7 @@ class PowerConnect < Oxidized::Model
       end
       out << line.strip
     end
+    out = out.select { |line| not line[/Up\sTime/] }
     out = comment out.join "\n"
     out << "\n"
   end

data/lib/oxidized/model/procurve.rb

@@ -1,11 +1,16 @@
 class Procurve < Oxidized::Model
 
-  # some models start lines with \r 
+  # some models start lines with \r
   # previous command is repeated followed by "\eE", which sometimes ends up on last line
-  prompt /^\r?([\w -]+\eE)?([\w.-]+# )$/
+  prompt /^\r?([\w.-]+# )$/
 
   comment  '! '
 
+  # replace next line control sequence with a new line
+  expect /(\e\[1M\e\[\??\d+(;\d+)*[A-Za-z]\e\[1L)|(\eE)/ do |data, re|
+    data.gsub re, "\n"
+  end
+
   # replace all used vt100 control sequences
   expect /\e\[\??\d+(;\d+)*[A-Za-z]/ do |data, re|
     data.gsub re, ''
@@ -17,7 +22,7 @@ class Procurve < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg = cfg.each_line.to_a[1..-3].join
+    cfg = cfg.each_line.to_a[1..-2].join
     cfg = cfg.gsub /^\r/, ''
   end
 

data/lib/oxidized/model/quantaos.rb

@@ -12,7 +12,7 @@ class QuantaOS < Oxidized::Model
   end
 
   cfg :telnet do
-    username /^Username:/
+    username /^User(name)?:/
     password /^Password:/
   end
 

data/lib/oxidized/model/routeros.rb

@@ -6,6 +6,10 @@ class RouterOS < Oxidized::Model
     comment cfg
   end
 
+  cmd '/system package update print' do |cfg|
+    comment cfg
+  end
+
   cmd '/export' do |cfg|
     cfg.gsub! /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/, '' # strip ANSI colours
     cfg.gsub! /\\\r\n\s+/, ''   # strip new line
@@ -18,6 +22,10 @@ class RouterOS < Oxidized::Model
     password /^Password:/
   end
 
+  cfg :telnet, :ssh do
+    pre_logout 'quit'
+  end
+
   cfg :ssh do
     exec true
   end

data/lib/oxidized/model/saos.rb

@@ -2,7 +2,7 @@ class SAOS < Oxidized::Model
 
   # Ciena SAOS switch
   # used for 6.x devices
- 
+
   comment  '! '
 
   cmd :all do |cfg|
@@ -10,6 +10,8 @@ class SAOS < Oxidized::Model
   end
 
   cmd 'configuration show' do |cfg|
+    cfg.gsub! /^! Created: [^\n]*\n/, ''
+    cfg.gsub! /^! On terminal: [^\n]*\n/, ''
     cfg
   end
 

data/lib/oxidized/model/siklu.rb

@@ -0,0 +1,19 @@
+class Siklu < Oxidized::Model
+
+  # Siklu EtherHaul #
+
+  prompt /^[\w-]+>$/
+
+  cmd 'copy startup-configuration display' do |cfg|
+    cfg.each_line.to_a[2..2].join
+  end
+
+  cmd 'copy running-configuration display' do |cfg|
+    cfg.each_line.to_a[3..-2].join
+  end
+
+  cfg :ssh do
+    pre_logout 'exit'
+  end
+
+end

data/lib/oxidized/model/timos.rb

@@ -18,6 +18,8 @@ class TiMOS < Oxidized::Model
   # Show the boot options file.
   #
   cmd 'show bof' do |cfg|
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
     comment cfg
   end
 
@@ -29,6 +31,8 @@ class TiMOS < Oxidized::Model
     # Strip uptime.
     #
     cfg.sub! /^System Up Time.*\n/, ''
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
     comment cfg
   end
 
@@ -36,6 +40,8 @@ class TiMOS < Oxidized::Model
   # Show the card state.
   #
   cmd 'show card state' do |cfg|
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
     comment cfg
   end
 
@@ -48,6 +54,8 @@ class TiMOS < Oxidized::Model
     #
     cfg.gsub! /\r/, ''
     cfg.gsub! /[\b][\b][\b]/, "\n"
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
     comment cfg
   end
 
@@ -55,6 +63,8 @@ class TiMOS < Oxidized::Model
   # Show the running debug configuration.
   #
   cmd 'show debug' do |cfg|
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
     comment cfg
   end
 
@@ -66,6 +76,8 @@ class TiMOS < Oxidized::Model
     # Strip carriage returns.
     #
     cfg.gsub! /\r/, ''
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
     comment cfg
   end
 
@@ -77,6 +89,8 @@ class TiMOS < Oxidized::Model
     # Strip carriage returns.
     #
     cfg.gsub! /\r/, ''
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
     comment cfg
   end
 
@@ -88,6 +102,8 @@ class TiMOS < Oxidized::Model
     # Strip carriage returns.
     #
     cfg.gsub! /\r/, ''
+    cfg.gsub! /# Finished .*/, ''
+    cfg.gsub! /# Generated .*/, ''
   end
 
   cfg :telnet do

data/lib/oxidized/model/tplink.rb

@@ -0,0 +1,65 @@
+class TPLink < Oxidized::Model
+
+  # tp-link prompt
+  prompt /^\r?([\w.@()-]+[#>]\s?)$/
+  comment  '! '
+
+  # handle paging
+  # workaround for sometimes missing whitespaces with "\s?"
+  expect /Press\s?any\s?key\s?to\s?continue\s?\(Q\s?to\s?quit\)/ do |data, re|
+   send ' '
+   data.sub re, ''
+  end
+
+  # send carriage return because \n with the command is not enough
+  # checks if line ends with prompt >,# or \r,\nm otherwise send \r
+  expect /[^>#\r\n]$/ do |data, re|
+   send "\r"
+   data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    # normalize linefeeds
+    cfg.gsub! /(\r|\r\n|\n\r)/,"\n"
+    # remove empty lines
+    cfg.each_line.reject { |line| line.match /^[\r\n\s\u0000#]+$/ }.join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    cfg.gsub! /secret (\d+) (\S+).*/, '<secret hidden>'
+    cfg
+  end
+
+  cmd 'show system-info'  do |cfg|
+    comment cfg.each_line.to_a[3..-3].join
+  end
+
+  cmd 'show running-config' do |cfg|
+    lines = cfg.each_line.to_a[1..-1]
+    # cut config after "end"
+    lines[0..lines.index("end\n")].join
+  end
+
+  cfg :telnet, :ssh do
+    username /^User ?[nN]ame:/
+    password /^\r?Password:/
+  end
+
+  cfg :telnet, :ssh do
+    if vars :enable
+      post_login do
+        send "enable\r"
+        cmd vars(:enable)
+      end
+    end
+
+    pre_logout do
+      send "exit\r"
+      send "logout\r"
+    end
+
+  end
+
+end
+