oxidized 0.25.1 → 0.26.0

data/lib/oxidized/model/powerconnect.rb

@@ -19,15 +19,15 @@ class PowerConnect < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
-    if (@stackable.nil?)
-      @stackable = true if cfg.match /(U|u)nit\s/
+    if @stackable.nil?
+      @stackable = true if cfg =~ /(U|u)nit\s/
     end
     cfg = cfg.split("\n").reject { |line| line[/Up\sTime/] }
     comment cfg.join("\n") + "\n"
   end
 
   cmd 'show system' do |cfg|
-    @model = $1 if cfg.match /Power[C|c]onnect (\d{4})[P|F]?/
+    @model = Regexp.last_match(1) if cfg =~ /Power[C|c]onnect (\d{4})[P|F]?/
     clean cfg
   end
 
@@ -45,7 +45,7 @@ class PowerConnect < Oxidized::Model
       if vars(:enable) == true
         cmd "enable"
       elsif vars(:enable)
-        cmd "enable", /^[pP]assword:/
+        cmd "enable", /[pP]assword:/
         cmd vars(:enable)
       end
     end
@@ -56,18 +56,18 @@ class PowerConnect < Oxidized::Model
     pre_logout "exit"
   end
 
-  def clean cfg
+  def clean(cfg)
     out = []
     skip_blocks = 0
     cfg.each_line do |line|
       # If this is a stackable switch we should skip this block of information
-      if (line.match /Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i and @stackable == true)
+      if line.match(/Up\sTime|Temperature|Power Suppl(ies|y)|Fans/i) && (@stackable == true)
         skip_blocks = 1
         # Some switches have another empty line. This is identified by this line having a colon
-        skip_blocks = 2 if line.match /:/
+        skip_blocks = 2 if line =~ /:/
       end
       # If we have lines to skip do this until we reach and empty line
-      if skip_blocks > 0
+      if skip_blocks.positive?
         skip_blocks -= 1 if /\S/ !~ line
         next
       end

data/lib/oxidized/model/procurve.rb

@@ -28,6 +28,7 @@ class Procurve < Oxidized::Model
   cmd :all do |cfg|
     cfg = cfg.cut_both
     cfg = cfg.gsub /^\r/, ''
+    cfg
   end
 
   cmd :secret do |cfg|
@@ -93,6 +94,6 @@ class Procurve < Oxidized::Model
   end
 
   cfg :ssh do
-    pty_options({ chars_wide: 1000 })
+    pty_options(chars_wide: 1000)
   end
 end

data/lib/oxidized/model/quantaos.rb

@@ -4,9 +4,9 @@ class QuantaOS < Oxidized::Model
 
   cmd 'show run' do |cfg|
     cfg.each_line.select do |line|
-      not line.match /^!.*$/ and
-        not line.match /^\((\w|\S)+\) (>|#)$/ and
-        not line.match /^show run$/
+      (not line.match /^!.*$/) &&
+        (not line.match /^\((\w|\S)+\) (>|#)$/) &&
+        (not line.match /^show run$/)
     end.join
   end
 

data/lib/oxidized/model/raisecom.rb

@@ -0,0 +1,19 @@
+class RAISECOM < Oxidized::Model
+  comment '! '
+  prompt /([\w.@-]+[#>]\s?)$/
+
+  cmd 'show version' do |cfg|
+    cfg.gsub! /\s(System uptime is ).*/, ' \\1 <removed>'
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg.gsub! /\s(^radius-encrypt-key ).*/, ' \\1 <removed>'
+    cfg
+  end
+
+  cfg :ssh do
+    post_login 'terminal page-break disable'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/siklu.rb

@@ -1,7 +1,7 @@
 class Siklu < Oxidized::Model
   # Siklu EtherHaul #
 
-  prompt /^[\w-]+>$/
+  prompt /^[\^M\s]{0,}[\w\-\s\.\"]+>$/
 
   cmd 'copy startup-configuration display' do |cfg|
     cfg.each_line.to_a[2..2].join

data/lib/oxidized/model/slxos.rb

@@ -10,7 +10,7 @@ class SLXOS < Oxidized::Model
   end
 
   cmd 'show chassis' do |cfg|
-    cfg.encode!("UTF-8", :invalid => :replace, :undef => :replace) # sometimes ironware returns broken encoding
+    cfg.encode!("UTF-8", invalid: :replace, undef: :replace) # sometimes ironware returns broken encoding
     cfg.gsub! /.*Power Usage.*/, '' # remove unwanted lines power usage
     cfg.gsub! /Time A(live|wake).*/, '' # remove unwanted lines time alive/awake
     cfg.gsub! /([\[]*)1([\]]*)<->([\[]*)2([\]]*)(<->([\[]*)3([\]]*))*/, ''

data/lib/oxidized/model/smartax.rb

@@ -0,0 +1,25 @@
+class SmartAX < Oxidized::Model
+  # Huawei SmartAX GPON/EPON/DOCSIS network access devices
+  prompt /^([\w.-]+[>#])$/
+
+  comment '#'
+
+  cfg :telnet do
+    username /^>>User name:$/
+    password /^>>User password:$/
+  end
+
+  cfg :ssh, :telnet do
+    post_login "enable"
+    post_login "undo interactive"
+    post_login "undo smart"
+    post_login "scroll"
+    pre_logout "quit"
+  end
+
+  # 'display current-configuration' returns current configuration stored in memory
+  # 'display saved-configuration'   returns configuration stored in the file system which is used upon reboot
+  cmd 'display current-configuration' do |cfg|
+    cfg.cut_both
+  end
+end

data/lib/oxidized/model/sros.rb

@@ -51,7 +51,7 @@ class SROS < Oxidized::Model
     #
     # Strip carriage returns and backspaces.
     #
-    cfg.gsub! /\r/, ''
+    cfg.delete! "\r"
     cfg.gsub! /[\b][\b][\b]/, "\n"
     cfg.gsub! /# Finished .*/, ''
     cfg.gsub! /# Generated .*/, ''
@@ -74,7 +74,7 @@ class SROS < Oxidized::Model
     #
     # Strip carriage returns.
     #
-    cfg.gsub! /\r/, ''
+    cfg.delete! "\r"
     cfg.gsub! /# Finished .*/, ''
     cfg.gsub! /# Generated .*/, ''
     comment cfg
@@ -87,7 +87,7 @@ class SROS < Oxidized::Model
     #
     # Strip carriage returns.
     #
-    cfg.gsub! /\r/, ''
+    cfg.delete! "\r"
     cfg.gsub! /# Finished .*/, ''
     cfg.gsub! /# Generated .*/, ''
     comment cfg
@@ -100,7 +100,7 @@ class SROS < Oxidized::Model
     #
     # Strip carriage returns.
     #
-    cfg.gsub! /\r/, ''
+    cfg.delete! "\r"
     cfg.gsub! /# Finished .*/, ''
     cfg.gsub! /# Generated .*/, ''
   end

data/lib/oxidized/model/tdre.rb

@@ -0,0 +1,30 @@
+class TDRE < Oxidized::Model
+  prompt /^>$/
+  cmd "get -f"
+
+  def ssh
+    @input.class.to_s.match(/SSH/)
+  end
+
+  expect /^>.+$/ do |data, re|
+    send "\r" if ssh
+    data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    if ssh
+      cfg.lines.to_a[5..-4].join
+    else
+      cfg.lines.to_a[1..-4].join
+    end
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    pre_logout "DISCONNECT\r"
+  end
+end

data/lib/oxidized/model/tmos.rb

@@ -26,6 +26,9 @@ class TMOS < Oxidized::Model
   cmd 'tmsh -q list' do |cfg|
     cfg.gsub!(/state (up|down|checking|irule-down)/, '')
     cfg.gsub!(/errors (\d+)/, '')
+    cfg.gsub!(/^\s+bandwidth-bps (\d+)/, '')
+    cfg.gsub!(/^\s+bandwidth-cps (\d+)/, '')
+    cfg.gsub!(/^\s+bandwidth-pps (\d+)\n/, '')
     cfg
   end
 

data/lib/oxidized/model/trango.rb

@@ -8,48 +8,28 @@ class Trango < Oxidized::Model
     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
-      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]
+        out << "speed #{speed}" if Regexp.last_match[1].eql? 'off'
       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

data/lib/oxidized/model/voltaire.rb

@@ -16,7 +16,7 @@ class VOLTAIRE < Oxidized::Model
     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.lines.to_a[2..-3].join
   end
 
   cmd :secret do |cfg|

data/lib/oxidized/model/voss.rb

@@ -23,9 +23,9 @@ class Voss < Oxidized::Model
 
   # more the config rather than doing a show run
   cmd 'more config.cfg' do |cfg|
-    cfg
     cfg.gsub! /^[^\s#>]+[#>]$/, ''
     cfg.gsub! /^more config.cfg/, '# more config.cfg'
+    cfg
   end
 
   cfg :telnet do

data/lib/oxidized/model/vyatta.rb

@@ -4,7 +4,7 @@ class Vyatta < Oxidized::Model
   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|

data/lib/oxidized/model/xos.rb

@@ -23,7 +23,7 @@ class XOS < Oxidized::Model
   end
 
   cmd 'show switch' do |cfg|
-    comment cfg.each_line.reject { |line| line.match /Time:/ or line.match /boot/i }.join
+    comment cfg.each_line.reject { |line| line.match(/Time:/) || line.match(/boot/i) }.join
   end
 
   cmd 'show configuration' do |cfg|

data/lib/oxidized/model/zhoneolt.rb

@@ -39,7 +39,7 @@ class ZhoneOLT < Oxidized::Model
   end
 
   cmd 'dump console' do |cfg|
-    cfg = cfg.each_line.reject { |line| 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/node.rb

@@ -7,12 +7,12 @@ module Oxidized
   class Node
     attr_reader :name, :ip, :model, :input, :output, :group, :auth, :prompt, :vars, :last, :repo
     attr_accessor :running, :user, :email, :msg, :from, :stats, :retry
-    alias :running? :running
+    alias running? running
 
-    def initialize opt
+    def initialize(opt)
       Oxidized.logger.debug 'resolving DNS for %s...' % opt[:name]
       # remove the prefix if an IP Address is provided with one as IPAddr converts it to a network address.
-      ip_addr, _ = opt[:ip].to_s.split("/")
+      ip_addr, = opt[:ip].to_s.split("/")
       Oxidized.logger.debug 'IPADDR %s' % ip_addr.to_s
       @name           = opt[:name]
       @ip             = IPAddr.new(ip_addr).to_s rescue nil
@@ -38,10 +38,10 @@ module Oxidized
       @input.each do |input|
         # don't try input if model is missing config block, we may need strong config to class_name map
         cfg_name = input.to_s.split('::').last.downcase
-        next unless @model.cfg[cfg_name] and not @model.cfg[cfg_name].empty?
+        next unless @model.cfg[cfg_name] && (not @model.cfg[cfg_name].empty?)
 
         @model.input = input = input.new
-        if config = run_input(input)
+        if (config = run_input(input))
           Oxidized.logger.debug "lib/oxidized/node.rb: #{input.class.name} ran for #{name} successfully"
           status = :success
           break
@@ -54,7 +54,7 @@ module Oxidized
       [status, config]
     end
 
-    def run_input input
+    def run_input(input)
       rescue_fail = {}
       [input.class::RescueFail, input.class.superclass::RescueFail].each do |hash|
         hash.each do |level, errors|
@@ -64,56 +64,56 @@ module Oxidized
         end
       end
       begin
-        input.connect(self) and input.get
+        input.connect(self) && input.get
       rescue *rescue_fail.keys => err
         resc = ''
-        if not level = rescue_fail[err.class]
-          resc  = err.class.ancestors.find { |e| rescue_fail.keys.include? e }
+        unless (level = rescue_fail[err.class])
+          resc  = err.class.ancestors.find { |e| rescue_fail.has_key?(e) }
           level = rescue_fail[resc]
           resc  = " (rescued #{resc})"
         end
-        Oxidized.logger.send(level, '%s raised %s%s with msg "%s"' % [self.ip, err.class, resc, err.message])
+        Oxidized.logger.send(level, '%s raised %s%s with msg "%s"' % [ip, err.class, resc, err.message])
         return false
-      rescue => err
+      rescue StandardError => err
         crashdir  = Oxidized.config.crash.directory
-        crashfile = Oxidized.config.crash.hostnames? ? self.name : self.ip.to_s
+        crashfile = Oxidized.config.crash.hostnames? ? name : ip.to_s
         FileUtils.mkdir_p(crashdir) unless File.directory?(crashdir)
 
-        open File.join(crashdir, crashfile), 'w' do |fh|
+        File.open File.join(crashdir, crashfile), 'w' do |fh|
           fh.puts Time.now.utc
           fh.puts err.message + ' [' + err.class.to_s + ']'
           fh.puts '-' * 50
           fh.puts err.backtrace
         end
-        Oxidized.logger.error '%s raised %s with msg "%s", %s saved' % [self.ip, err.class, err.message, crashfile]
+        Oxidized.logger.error '%s raised %s with msg "%s", %s saved' % [ip, err.class, err.message, crashfile]
         return false
       end
     end
 
     def serialize
       h = {
-        :name      => @name,
-        :full_name => @name,
-        :ip        => @ip,
-        :group     => @group,
-        :model     => @model.class.to_s,
-        :last      => nil,
-        :vars      => @vars,
-        :mtime     => @stats.mtime,
+        name:      @name,
+        full_name: @name,
+        ip:        @ip,
+        group:     @group,
+        model:     @model.class.to_s,
+        last:      nil,
+        vars:      @vars,
+        mtime:     @stats.mtime
       }
       h[:full_name] = [@group, @name].join('/') if @group
       if @last
         h[:last] = {
-          :start  => @last.start,
-          :end    => @last.end,
-          :status => @last.status,
-          :time   => @last.time,
+          start:  @last.start,
+          end:    @last.end,
+          status: @last.status,
+          time:   @last.time
         }
       end
       h
     end
 
-    def last= job
+    def last=(job)
       if job
         ostruct = OpenStruct.new
         ostruct.start  = job.start
@@ -137,46 +137,42 @@ module Oxidized
 
     private
 
-    def resolve_prompt opt
+    def resolve_prompt(opt)
       opt[:prompt] || @model.prompt || Oxidized.config.prompt
     end
 
-    def resolve_auth opt
+    def resolve_auth(opt)
       # Resolve configured username/password
       {
-        username:       resolve_key(:username, opt),
-        password:       resolve_key(:password, opt),
+        username: resolve_key(:username, opt),
+        password: resolve_key(:password, opt)
       }
     end
 
-    def resolve_input opt
+    def resolve_input(opt)
       inputs = resolve_key :input, opt, Oxidized.config.input.default
       inputs.split(/\s*,\s*/).map do |input|
-        if not Oxidized.mgr.input[input]
-          Oxidized.mgr.add_input input or raise MethodNotFound, "#{input} not found for node #{ip}"
-        end
+        Oxidized.mgr.add_input(input) || raise(MethodNotFound, "#{input} not found for node #{ip}") unless Oxidized.mgr.input[input]
         Oxidized.mgr.input[input]
       end
     end
 
-    def resolve_output opt
+    def resolve_output(opt)
       output = resolve_key :output, opt, Oxidized.config.output.default
-      if not Oxidized.mgr.output[output]
-        Oxidized.mgr.add_output output or raise MethodNotFound, "#{output} not found for node #{ip}"
-      end
+      Oxidized.mgr.add_output(output) || raise(MethodNotFound, "#{output} not found for node #{ip}") unless Oxidized.mgr.output[output]
       Oxidized.mgr.output[output]
     end
 
-    def resolve_model opt
+    def resolve_model(opt)
       model = resolve_key :model, opt
-      if not Oxidized.mgr.model[model]
+      unless Oxidized.mgr.model[model]
         Oxidized.logger.debug "lib/oxidized/node.rb: Loading model #{model.inspect}"
-        Oxidized.mgr.add_model model or raise ModelNotFound, "#{model} not found for node #{ip}"
+        Oxidized.mgr.add_model(model) || raise(ModelNotFound, "#{model} not found for node #{ip}")
       end
       Oxidized.mgr.model[model].new
     end
 
-    def resolve_repo opt
+    def resolve_repo(opt)
       type = git_type opt
       return nil unless type
 
@@ -192,7 +188,7 @@ module Oxidized
       end
     end
 
-    def resolve_key key, opt, global = nil
+    def resolve_key(key, opt, global = nil)
       # resolve key, first get global, then get group then get node config
       key_sym = key.to_sym
       key_str = key.to_s
@@ -200,7 +196,7 @@ module Oxidized
       Oxidized.logger.debug "node.rb: resolving node key '#{key}', with passed global value of '#{value}' and node value '#{opt[key_sym]}'"
 
       # global
-      if not value and Oxidized.config.has_key?(key_str)
+      if (not value) && Oxidized.config.has_key?(key_str)
         value = Oxidized.config[key_str]
         Oxidized.logger.debug "node.rb: setting node key '#{key}' to value '#{value}' from global"
       end
@@ -227,7 +223,7 @@ module Oxidized
       value
     end
 
-    def git_type opt
+    def git_type(opt)
       type = opt[:output] || Oxidized.config.output.default
       return nil unless type[0..2] == "git"