oxidized 0.20.0 → 0.28.0

data/lib/oxidized/model/tplink.rb

@@ -1,37 +1,40 @@
 class TPLink < Oxidized::Model
-
   # tp-link prompt
   prompt /^\r?([\w.@()-]+[#>]\s?)$/
-  comment  '! '
+  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, ''
+    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, ''
+    send "\r"
+    data.sub re, ''
   end
 
   cmd :all do |cfg|
+    # remove unwanted paging line
+    cfg.gsub! /^Press any key to contin.*/, ''
     # normalize linefeeds
-    cfg.gsub! /(\r|\r\n|\n\r)/,"\n"
+    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! /^enable password (\S+)/, 'enable password <secret hidden>'
+    cfg.gsub! /^user (\S+) password (\S+) (.*)/, 'user \1 password <secret hidden> \3'
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
     cfg.gsub! /secret (\d+) (\S+).*/, '<secret hidden>'
     cfg
   end
 
-  cmd 'show system-info'  do |cfg|
+  cmd 'show system-info' do |cfg|
     comment cfg.each_line.to_a[3..-3].join
   end
 
@@ -58,8 +61,5 @@ class TPLink < Oxidized::Model
       send "exit\r"
       send "logout\r"
     end
-
   end
-
 end
-

data/lib/oxidized/model/trango.rb

@@ -1,62 +1,41 @@
 class Trango < Oxidized::Model
   # take a Trangolink sysinfo output and turn it into a configuration file
-  
+
   prompt /^#>\s?/
-  comment  '# '
+  comment '# '
 
   cmd 'sysinfo' do |cfg|
     out = []
     comments = []
     cfg.each_line do |line|
-      if line.match /\[Opmode\] (off|on) \[Default Opmode\] (off|on)/
+      if line =~ /\[Opmode\] (off|on) \[Default Opmode\] (off|on)/
         out << "opmode " + Regexp.last_match[1]
         out << "defaultopmode " + Regexp.last_match[2]
       end
-      if line.match /\[Tx Power\] ([\-\d]+) dBm/
-        out << "power " + Regexp.last_match[1]
-      end
-      if line.match /\[Active Channel\] (\d+) (v|h)/
-        out << "freq " + Regexp.last_match[1] + ' ' + Regexp.last_match[2]
-      end
-      if line.match /\[Peer ID\] ([A-F0-9]+)/
-        out << "peerid " + Regexp.last_match[1]
-      end
-      if line.match /\[Unit Type\] (\S+)/
-        out << "utype " + Regexp.last_match[1]
-      end
-      if line.match /\[(Hardware Version|Firmware Version|Model|S\/N)\] (\S+)/
-        comments << '# ' + Regexp.last_match[1] + ': ' + Regexp.last_match[2]
-      end
-      if line.match /\[Remarks\] (\S+)/
-        out << "remarks " + Regexp.last_match[1]
-      end
-      if line.match /\[RSSI LED\] (on|off)/
-        out << "rssiled " + Regexp.last_match[1]
-      end
-      if line.match /\[Speed\] (\d+) Mbps/
-        speed = Regexp.last_match[1]
-      end
-      if line.match /\[Tx MIR\] (\d+) Kbps/
-        out << "mir ".concat(Regexp.last_match[1])
-      end
-      if line.match /\[Auto Rate Shift\] (on|off)/
+      out << "power " + Regexp.last_match[1] if line =~ /\[Tx Power\] ([\-\d]+) dBm/
+      out << "freq " + Regexp.last_match[1] + ' ' + Regexp.last_match[2] if line =~ /\[Active Channel\] (\d+) (v|h)/
+      out << "peerid " + Regexp.last_match[1] if line =~ /\[Peer ID\] ([A-F0-9]+)/
+      out << "utype " + Regexp.last_match[1] if line =~ /\[Unit Type\] (\S+)/
+      comments << '# ' + Regexp.last_match[1] + ': ' + Regexp.last_match[2] if line =~ /\[(Hardware Version|Firmware Version|Model|S\/N)\] (\S+)/
+      out << "remarks " + Regexp.last_match[1] if line =~ /\[Remarks\] (\S+)/
+      out << "rssiled " + Regexp.last_match[1] if line =~ /\[RSSI LED\] (on|off)/
+      speed = Regexp.last_match[1] if line =~ /\[Speed\] (\d+) Mbps/
+      out << "mir ".concat(Regexp.last_match[1]) if line =~ /\[Tx MIR\] (\d+) Kbps/
+      if line =~ /\[Auto Rate Shift\] (on|off)/
         out << "autorateshift ".concat(Regexp.last_match[1])
-        if Regexp.last_match[1].eql? 'off'
-          out << "speed $speed"
-        end
+        out << "speed #{speed}" if Regexp.last_match[1].eql? 'off'
       end
-      if line.match /\[IP\] (\S+) \[Subnet Mask\] (\S+) \[Gateway\] (\S+)/
-        out << "ipconfig " + Regexp.last_match[1] + ' ' +
-                              Regexp.last_match[2] + ' ' +
-                              Regexp.last_match[3]
-      end
-    end 
+      next unless line =~ /\[IP\] (\S+) \[Subnet Mask\] (\S+) \[Gateway\] (\S+)/
+
+      out << "ipconfig " + Regexp.last_match[1] + ' ' +
+             Regexp.last_match[2] + ' ' +
+             Regexp.last_match[3]
+    end
     comments.push(*out).join "\n"
-  end 
+  end
 
   cfg :telnet do
     password /Password:/
     pre_logout 'exit'
   end
- 
 end

data/lib/oxidized/model/ucs.rb

@@ -0,0 +1,30 @@
+class UCS < Oxidized::Model
+  prompt /^(\r?[\w.@_()-]+[#]\s?)$/
+  comment '! '
+
+  cmd 'show version brief' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show chassis detail' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show fabric-interconnect detail' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show configuration all | no-more' do |cfg|
+    cfg
+  end
+
+  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/viptela.rb

@@ -0,0 +1,29 @@
+class Viptela < Oxidized::Model
+  # Cisco Vipetla
+
+  prompt /[-\w]+#\s$/
+  comment  '! '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /(^\s+secret-key|password|auth-password|priv-password)\s+.*$/, '\\1 <secret hidden>'
+    cfg.gsub! /(^\s+community)\s.*$/, '\\1 <secret hidden>'
+    cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cfg :ssh do
+    post_login 'paginate false'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/voltaire.rb

@@ -1,24 +1,22 @@
 class VOLTAIRE < Oxidized::Model
-
   prompt /([\w.@()-\[:\s\]]+[#>]\s|(One or more tests have failed.*))$/
-  comment  '## '
-  
+  comment '## '
+
   # Pager Handling
-  expect /.+lines\s\d+\-\d+([\s]|\/\d+\s\(END\)\s).+$/ do |data, re|
+  expect /.+lines\s\d+-\d+([\s]|\/\d+\s\(END\)\s).+$/ do |data, re|
     send ' '
     data.sub re, ''
   end
 
-
   cmd :all do |cfg|
     cfg.gsub! /\[\?1h=\r/, '' # Pager Handling
-    cfg.gsub! /\r\[K/,'' # 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
+    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.lines.to_a[2..-3].join
   end
 
   cmd :secret do |cfg|
@@ -27,7 +25,6 @@ class VOLTAIRE < Oxidized::Model
     cfg
   end
 
-
   cmd 'version show' do |cfg|
     comment cfg
   end

data/lib/oxidized/model/voss.rb

@@ -1,22 +1,34 @@
 class Voss < Oxidized::Model
-  # Avaya VSP Operating System Software(VOSS)
+  # Extreme/Avaya VSP Operating System Software(VOSS)
   # Created by danielcoxman@gmail.com
-  # May 9, 2017
+  # March 16, 2019
   # This was tested on vsp4k and vsp8k
 
   comment '# '
 
   prompt /^[^\s#>]+[#>]$/
 
+  # needed for proper formatting after post_login
+  cmd('') { |cfg| comment "#{cfg}\n" }
+
+  # Get sys-info and remove information that changes such has temperature and power
   cmd 'show sys-info' do |cfg|
-    comment cfg
+    cfg.gsub! /(^((.*)SysUpTime(.*))$)/, 'removed SysUpTime'
+    cfg.gsub! /^((.*)Temperature Info :(.*\r?\n){4})/, 'removed Temperature Info and 3 more lines'
+    cfg.gsub! /(^((.*)AmbientTemperature(.*):(.*))$)/, 'removed AmbientTemperature'
+    cfg.gsub! /(^((.*)Last Change(.*):(.*))$)/, 'remove Last Change'
+    cfg.gsub! /(^((.*)Last Statistic Reset(.*):(.*))$)/, 'removed Last Statistic Reset'
+    cfg.gsub! /(^((.*)Last Vlan Change(.*):(.*))$)/, 'removed Last Vlan Change'
+    cfg.gsub! /(^((.*)Temperature(.*):(.*))$)/, 'removed Temperature'
+    cfg.gsub! /(^((.*)Total Power Usage(.*):(.*))$)/, 'removed Total Power Usage'
+    comment "#{cfg}\n"
   end
 
   # more the config rather than doing a show run
   cmd 'more config.cfg' do |cfg|
-    cfg
     cfg.gsub! /^[^\s#>]+[#>]$/, ''
-    cfg.gsub! /^more config.cfg/, ''
+    cfg.gsub! /^more config.cfg/, '# more config.cfg'
+    cfg
   end
 
   cfg :telnet do
@@ -29,5 +41,4 @@ class Voss < Oxidized::Model
     post_login 'enable'
     post_login 'terminal more disable'
   end
-
 end

data/lib/oxidized/model/vrp.rb

@@ -1,25 +1,31 @@
 class VRP < Oxidized::Model
   # Huawei VRP
-  
+
   prompt /^(<[\w.-]+>)$/
   comment '# '
 
+  cmd :secret do |cfg|
+    cfg.gsub! /(pin verify (?:auto|)).*/, '\\1 <PIN hidden>'
+    cfg.gsub! /(%\^%#.*%\^%#)/, '<secret hidden>'
+    cfg
+  end
+
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
- 
+
   cfg :telnet do
     username /^Username:$/
     password /^Password:$/
   end
 
-  cfg :telnet, :ssh do 
+  cfg :telnet, :ssh do
     post_login 'screen-length 0 temporary'
     pre_logout 'quit'
   end
 
   cmd 'display version' do |cfg|
-    cfg = cfg.each_line.select {|l| not l.match /uptime/ }.join
+    cfg = cfg.each_line.reject { |l| l.match /uptime/ }.join
     comment cfg
   end
 
@@ -30,5 +36,4 @@ class VRP < Oxidized::Model
   cmd 'display current-configuration all' do |cfg|
     cfg
   end
-  
 end

data/lib/oxidized/model/vyatta.rb

@@ -1,19 +1,22 @@
 class Vyatta < Oxidized::Model
-
   # Brocade Vyatta / VyOS model #
-  
-  prompt /\@.*?\:~\$\s/
+
+  prompt /@.*?:~\$\s/
 
   cmd :all do |cfg|
-    cfg = cfg.lines.to_a[1..-2].join
+    cfg.lines.to_a[1..-2].join
   end
 
   cmd :secret do |cfg|
+    cfg.gsub! /encrypted-password (\S+).*/, 'encrypted-password <secret removed>'
+    cfg.gsub! /plaintext-password (\S+).*/, 'plaintext-password <secret removed>'
+    cfg.gsub! /password (\S+).*/, 'password <secret removed>'
+    cfg.gsub! /pre-shared-secret (\S+).*/, 'pre-shared-secret <secret removed>'
     cfg.gsub! /community (\S+) {/, 'community <hidden> {'
     cfg
   end
 
-  cmd 'show configuration | no-more'
+  cmd 'show configuration commands | no-more'
 
   cfg :telnet do
     username  /login:\s/
@@ -23,5 +26,4 @@ class Vyatta < Oxidized::Model
   cfg :telnet, :ssh do
     pre_logout 'exit'
   end
-
 end

data/lib/oxidized/model/weos.rb

@@ -0,0 +1,20 @@
+class WEOS < Oxidized::Model
+  # Westell WEOS, works with Westell 8178G, Westell 8266G
+
+  prompt /^(\s[\w.@-]+[#>]\s?)$/
+
+  cmd :all do |cfg|
+    cfg.cut_both
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg
+  end
+
+  cfg :telnet do
+    username /login:/
+    password /assword:/
+    post_login 'cli more disable'
+    pre_logout 'logout'
+  end
+end

data/lib/oxidized/model/xos.rb

@@ -1,14 +1,13 @@
 class XOS < Oxidized::Model
-
   # Extreme Networks XOS
 
-  prompt /^*?[\w .-]+# $/
+  prompt /^\*?\s?[-\w.~]+(:\d+)? [#>] $/
   comment  '# '
 
   cmd :all do |cfg|
     # xos inserts leading \r characters and other trailing white space.
     # this deletes extraneous \r and trailing white space.
-    cfg.each_line.to_a[1..-2].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
+    cfg.each_line.to_a[1..-2].map { |line| line.delete("\r").rstrip }.join("\n") + "\n"
   end
 
   cmd 'show version' do |cfg|
@@ -23,11 +22,18 @@ class XOS < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show switch'do |cfg|
-    comment cfg.each_line.reject { |line| line.match /Time:/ or line.match /boot/i }.join
+  cmd 'show switch' do |cfg|
+    comment cfg.each_line.reject { |line| line.match(/Time:/) || line.match(/boot/i) }.join
+  end
+
+  cmd 'show configuration' do |cfg|
+    cfg = cfg.each_line.reject { |line| line.match /^#(\s[\w -]+\s)(Configuration generated)/ }.join
+    cfg
   end
 
-  cmd 'show configuration'
+  cmd 'show policy detail' do |cfg|
+    comment cfg
+  end
 
   cfg :telnet do
     username /^login:/
@@ -35,11 +41,17 @@ class XOS < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
-    post_login 'disable clipaging'
+    post_login do
+      data = cmd 'disable clipaging session'
+      match = data.match /^disable clipaging session\n\*?[\w .-]+(:\d+)? [#>] $/m
+      next if match
+
+      cmd 'disable clipaging'
+    end
+
     pre_logout do
       send "exit\n"
       send "n\n"
     end
   end
-
 end

data/lib/oxidized/model/zhoneolt.rb

@@ -18,7 +18,7 @@ class ZhoneOLT < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
+    cfg.each_line.to_a[1..-2].map { |line| line.delete("\r").rstrip }.join("\n") + "\n"
   end
 
   cmd 'swversion' do |cfg|
@@ -39,7 +39,7 @@ class ZhoneOLT < Oxidized::Model
   end
 
   cmd 'dump console' do |cfg|
-    cfg = cfg.each_line.select { |line| not line.match /To Abort the operation enter Ctrl-C/ }.join
+    cfg.each_line.reject { |line| line.match /To Abort the operation enter Ctrl-C/ }.join
   end
 
   # zhone technically supports ssh, but it locks up a ton.  Especially when

data/lib/oxidized/model/zynos.rb

@@ -1,12 +1,10 @@
 class ZyNOS < Oxidized::Model
-
   # Used in Zyxel DSLAMs, such as SAM1316
 
-  comment  '! '
+  comment '! '
 
   cmd 'config-0'
 
   cfg :ftp do
   end
-
 end

data/lib/oxidized/model/zynoscli.rb

@@ -0,0 +1,36 @@
+class ZyNOSCLI < Oxidized::Model
+  # Used in Zyxel DSLAMs, such as SAM1316
+
+  # Typical prompt "XGS4600#"
+  prompt /^([\w.@()-]+[#>]\s\e7)$/
+  comment  ';; '
+
+  cmd :all do |cfg|
+    cfg.gsub! /^.*\e7/, ''
+  end
+  cmd 'show stacking'
+
+  cmd 'show version'
+
+  cmd 'show running-config'
+
+  cfg :telnet do
+    username /^User name:/i
+    password /^Password:/i
+  end
+
+  cfg :telnet, :ssh do
+    if vars :enable
+      post_login do
+        send "enable\n"
+        # Interpret enable: true as meaning we won't be prompted for a password
+        unless vars(:enable).is_a? TrueClass
+          expect /[pP]assword:\s?$/
+          send vars(:enable) + "\n"
+        end
+        expect /^.+[#]$/
+      end
+    end
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/zynosgs.rb

@@ -0,0 +1,38 @@
+class ZyNOSGS < Oxidized::Model
+  # Used in Zyxel GS1900 switches, tested with GS1900-8
+  prompt /^.*# $/
+  comment '! '
+  expect /^--More--$/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
+  # replace all used vt100 control sequences
+  expect /\e\[\??\d+(;\d+)*[A-Za-z]/ do |data, re|
+    data.gsub re, ''
+  end
+  cmd 'show running-config' do |cfg|
+    cfg.gsub! /(System Up Time:) \S+(.*)/, '\\1 <time>'
+    # Remove garbage vt100 control sequences
+    # Backspace 0x07 char or escape char + control chars
+    cfg.gsub! /[\b]|\e\[A|\e\[2K/, ''
+    cfg
+  end
+
+  cfg :telnet, :ssh do
+    username /^(User name|.*Username):/
+    password /^\r?Password:/
+  end
+  cfg :telnet do
+    pre_logout do
+      send "exit\r"
+    end
+  end
+  cfg :ssh do
+    pre_logout do
+      # Yes, that GS1900 switch needs two exit !
+      send "exit\n"
+      send "exit\n"
+    end
+  end
+end

data/lib/oxidized/node/stats.rb

@@ -1,33 +1,58 @@
 module Oxidized
   class Node
     class Stats
+      attr_reader :mtimes
       MAX_STAT = 10
 
       # @param [Job] job job whose information add to stats
       # @return [void]
-      def add job
+      def add(job)
         stat = {
-          :start  => job.start,
-          :end    => job.end,
-          :time   => job.time,
+          start: job.start,
+          end:   job.end,
+          time:  job.time
         }
         @stats[job.status] ||= []
-        @stats[job.status].shift if @stats[job.status].size > MAX_STAT
+        @stats[job.status].shift if @stats[job.status].size > @history_size
         @stats[job.status].push stat
+        @stats[:counter][job.status] += 1
       end
 
       # @param [Symbol] status stats for specific status
       # @return [Hash,Array] Hash of stats for every status or Array of stats for specific status
-      def get status=nil
+      def get(status = nil)
         status ? @stats[status] : @stats
       end
 
+      def get_counter(counter = nil)
+        counter ? @stats[:counter][counter] : @stats[:counter]
+      end
+
+      def successes
+        @stats[:counter][:success]
+      end
+
+      def failures
+        @stats[:counter].reduce(0) { |m, h| h[0] == :success ? m : m + h[1] }
+      end
+
+      def mtime
+        mtimes.last
+      end
+
+      def update_mtime
+        @mtimes.push Time.now.utc
+        @mtimes.shift
+      end
+
       private
 
       def initialize
-        @stats = {}
+        @history_size = Oxidized.config.stats.history_size? || MAX_STAT
+        @mtimes = Array.new(@history_size, "unknown")
+        @stats  = {}
+        @stats[:counter] = Hash.new 0
       end
-
     end
   end
 end