oxidized 0.32.1 → 0.34.0

data/lib/oxidized/model/eatonnetwork.rb

@@ -0,0 +1,65 @@
+class EatonNetwork < Oxidized::Model
+  using Refinements
+  # Eaton Gigabit Network Card M3
+
+  # -p option is a passphrase used to encrypted parts of the config data, the
+  # encrypted data is nondeterministic and changes with each run. Use auth
+  # password as the passphrase.
+  #
+  # See docs/Model-Notes/EatonNetwork.md for more info
+  post do
+    # Get config in post to allow passing auth password to cmd.
+    cfg = cmd "save_configuration -p #{@node.auth[:password]}"
+    cfg
+  end
+
+  cmd :all do |cfg|
+    # `save_configuration` echos the command back, outputs date time info, with
+    # last line is the prompt again.
+    json_str = cfg.each_line.select { |line| line.match /^\{/ }.join
+    json = JSON.parse(json_str)
+
+    json['features']['userAndSessionManagement']['data']['settings']['all']['1.0']['local']['1.0']['predefinedAccounts'].each do |n|
+      n.delete('attemptLogin')
+      n['password'].delete('history')
+    end
+    json['features']['userAndSessionManagement']['data']['settings']['all']['1.0']['local']['1.0']['createdAccounts'].each do |n|
+      n.delete('attemptLogin')
+      n['password'].delete('history')
+    end
+
+    cfg = JSON.pretty_generate(json)
+    cfg
+  end
+
+  cmd :secret do |cfg|
+    # Re-parse json to remove secrets by json path
+    json = JSON.parse(cfg)
+
+    json.delete('passphrase')
+    json['features']['rms']['data']['settings'].delete('proxyUsername')
+    json['features']['rms']['data']['settings'].delete('proxyPassword')
+    json['features']['rms']['data']['settings'].delete('username')
+    json['features']['rms']['data']['settings'].delete('password')
+    json['features']['rms']['data']['settings'].delete('defaultPassword')
+
+    json['features']['smtp']['data']['dmeData'].delete('password')
+
+    json['features']['snmp']['data']['dmeData']['v3']['users'].each do |n|
+      n['auth'].delete('password')
+      n['priv'].delete('password')
+    end
+
+    json['features']['userAndSessionManagement']['data']['settings']['all']['1.0']['ldap']['1.0']['settings']['connectivity']['bind'].delete('password')
+    json['features']['userAndSessionManagement']['data']['settings']['all']['1.0']['radius']['1.0']['settings']['connectivity']['primaryServer'].delete('secret')
+    json['features']['userAndSessionManagement']['data']['settings']['all']['1.0']['radius']['1.0']['settings']['connectivity']['secondaryServer'].delete('secret')
+
+    cfg = JSON.pretty_generate(json)
+    cfg
+  end
+
+  cfg :ssh do
+    exec true
+    pre_logout 'logout'
+  end
+end

data/lib/oxidized/model/edgecos.rb

@@ -32,7 +32,8 @@ class EdgeCOS < Oxidized::Model
   cmd 'show system' do |cfg|
     cfg.gsub! /^.*\sUp Time\s*:.*\n/i, ''
     cfg.gsub! /(\sTemperature \d*:)\s*\d+ degrees/, '\\1 <temperature values hidden>'
-    cfg.gsub! /^!?\s*Fan \d+ speed:\s+\d+ rpm\s+Fan \d+ speed:\s+\d+ rpm\s+Fan \d+ speed:\s+\d+ rpm$/, '<fan speeds hidden>'
+    cfg.gsub! /^!?\s*Fan \d+ speed:\s+\d+ rpm\s+Fan \d+ speed:\s+\d+ rpm\s+Fan \d+ speed:\s+\d+ rpm$/,
+              '<fan speeds hidden>'
     comment cfg
   end
 

data/lib/oxidized/model/edgeos.rb

@@ -1,7 +1,7 @@
 class Edgeos < Oxidized::Model
   using Refinements
 
-  # EdgeOS #
+  # Ubiquiti EdgeOS #
 
   prompt /@.*?:~\$\s/
 
@@ -10,11 +10,12 @@ class Edgeos < Oxidized::Model
   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.gsub!(/(encrypted-password) \S+/, '\1 <secret removed>')
+    cfg.gsub!(/(plaintext-password) \S+/, '\1 <secret removed>')
+    cfg.gsub!(/(password) \S+/, '\1 <secret removed>')
+    cfg.gsub!(/(pre-shared-secret) \S+/, '\1 <secret removed>')
+    cfg.gsub!(/(community) \S+ {/, '\1 <hidden> {')
+    cfg.gsub!(/(commit-archive location) \S+/, '\1 <secret removed>')
     cfg
   end
 

data/lib/oxidized/model/edgeswitch.rb

@@ -8,7 +8,9 @@ class EdgeSwitch < Oxidized::Model
   prompt /\(.*\)\s[#>]/
 
   cmd 'show running-config' do |cfg|
-    cfg.each_line.to_a[2..-2].reject { |line| line.match(/System Up Time.*/) || line.match(/Current SNTP Synchronized Time.*/) }.join
+    cfg.each_line.to_a[2..-2].reject do |line|
+      line.match(/System Up Time.*/) || line.match(/Current SNTP Synchronized Time.*/)
+    end.join
   end
 
   cfg :telnet do

data/lib/oxidized/model/efos.rb

@@ -0,0 +1,41 @@
+class EFOS < Oxidized::Model
+  using Refinements
+
+  # Enhanced Fabric OS - Broadcom
+  comment '! '
+  prompt /^([\w.@()-]+[#>]\s?)$/
+
+  cmd :all do |cfg|
+    # Remove the echo of the entered command and the prompt after it
+    cfg.cut_both
+  end
+
+  cmd 'show bootvar' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show fiber-ports optical-transceiver-info all' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg.each_line
+       .reject { |line| line.match(/System Up Time/) }
+       .reject { |line| line.match(/Current System Time:/) }
+       .reject { |line| line.match(/Current SNTP Synchronized Time:/) }
+       .join
+  end
+
+  cfg :telnet, :ssh do
+    post_login do
+      if vars(:enable) == true
+        cmd 'enable'
+      elsif vars(:enable)
+        cmd 'enable', /^[pP]assword:/
+        cmd vars(:enable)
+      end
+    end
+    post_login 'terminal length 0'
+    pre_logout 'logout'
+  end
+end

data/lib/oxidized/model/eltex.rb

@@ -16,7 +16,7 @@ class Eltex < Oxidized::Model
     cfg.gsub! /^(enable (password|secret)( level \d+)? \d) .+/, '\\1 <secret hidden>'
     cfg.gsub! /^(\s+(?:password|secret)) (?:\d )?\S+/, '\\1 <secret hidden>'
     cfg.gsub! /^(tacacs-server (.+ )?key) .+/, '\\1 <secret hidden>'
-    cfg.gsub! /^((tacacs|radius) server [^\n]+\n(\s+[^\n]+\n)*\s+key) [^\n]+$/m, '\1 <secret hidden>'
+    cfg.gsub! /^((tacacs|radius) server [^\n]+\n( +[^\n]+\n)*\s+key) [^\n]+$/m, '\1 <secret hidden>'
     cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
     cfg.gsub! /^username \S+ password \d \S+/, '<secret hidden>'
     cfg.gsub! /^enable password \d \S+/, '<secret hidden>'

data/lib/oxidized/model/fabricos.rb

@@ -8,7 +8,7 @@ class FabricOS < Oxidized::Model
   comment '# '
 
   cmd 'chassisShow' do |cfg|
-    comment cfg.each_line.reject { |line| line.match(/Time Awake:/) || line.match(/Power Usage \(Watts\):/) || line.match(/Power Usage:/) || line.match(/Time Alive:/) || line.match(/Update:/) }.join
+    comment cfg.each_line.reject { |line| line.match(/Time Awake:/) || line.match(/Power Usage \(Watts\):/) || line.match(/Power Usage:/) || line.match(/Time Alive:/) || line.match(/Update:/) || line.match(/PS Voltage input:/) }.join
   end
 
   cmd 'configShow -all' do |cfg|

data/lib/oxidized/model/fastiron.rb

@@ -19,7 +19,9 @@ class FastIron < Oxidized::Model
     lines.each_with_index do |line, _i|
       comments << "Version: #{Regexp.last_match(1)}" if line =~ /^\s+SW: Version (.*)$/
 
-      comments << "Boot-Monitor Version: #{Regexp.last_match(1)}" if line =~ /^\s+Compressed Boot-Monitor Image size = \d+, Version:(.*)$/
+      if line =~ /^\s+Compressed Boot-Monitor Image size = \d+, Version:(.*)$/
+        comments << "Boot-Monitor Version: #{Regexp.last_match(1)}"
+      end
 
       comments << "Serial: #{Regexp.last_match(1)}" if line =~ /^\s+Serial  #:(.*)$/
     end

data/lib/oxidized/model/firelinuxos.rb

@@ -3,12 +3,21 @@ class FireLinuxOS < Oxidized::Model
 
   # Fire Linux OS is what the new FTD (FirePOWER) series devices from Cisco run. At the backend, it's mostly identical to ASA's.
 
-  prompt /^[#>]\(?.+\)?\s?/
-  comment  '! '
+  prompt /^[#>]\(?.+\)? ?$/
+  comment '! '
+
+  expect /^Syntax error: .*\n.*$/ do |data, re|
+    # The firepower does not remove the entered command, so
+    # Send CTRL-U and \n for a fresh prompt
+    send "\x15\n"
+    data.sub re, ''
+  end
 
   cmd :all do |cfg|
     cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
-    cfg.each_line.to_a[1..-2].join
+    # Ged rid of ANSI escape codes
+    cfg.gsub! /\e\[[0-?]*[ -\/]*[@-~]\r?/, ''
+    cfg.cut_both
   end
 
   cmd :secret do |cfg|

data/lib/oxidized/model/fortios.rb

@@ -3,7 +3,7 @@ class FortiOS < Oxidized::Model
 
   comment '# '
 
-  prompt /^([-\w.~]+(\s[(\w\-.)]+)?~?\s?[#>$]\s?)$/
+  prompt /^(\(\w\) )?([-\w.~]+(\s[(\w\-.)]+)?~?\s?[#>$]\s?)$/
 
   # When a post-login-banner is enabled, you have to press "a" to log in
   expect /^\(Press\s'a'\sto\saccept\):/ do |data, re|
@@ -39,11 +39,11 @@ class FortiOS < Oxidized::Model
 
   cmd 'get system status' do |cfg|
     @vdom_enabled = cfg.match /Virtual domain configuration: (enable|multiple)/
-    cfg.gsub! /(System time:).*/, '\\1 <stripped>'
+    cfg.gsub! /(System time:).*/i, '\\1 <stripped>'
     cfg.gsub! /(Cluster (?:uptime|state change time):).*/, '\\1 <stripped>'
     cfg.gsub! /(Current Time\s+:\s+)(.*)/, '\1<stripped>'
     cfg.gsub! /(Uptime:\s+)(.*)/, '\1<stripped>\3'
-    cfg.gsub! /(Last reboot:\s+)(.*)/, '\1<stripped>\3'
+    cfg.gsub! /(Last reboot:\s+)(.*)/i, '\1<stripped>\3'
     cfg.gsub! /(Disk Usage\s+:\s+)(.*)/, '\1<stripped>'
     cfg.gsub! /(^\S+ (?:disk|DB):\s+)(.*)/, '\1<stripped>\3'
     cfg.gsub! /(VM Registration:\s+)(.*)/, '\1<stripped>\3'
@@ -96,7 +96,8 @@ class FortiOS < Oxidized::Model
 
     commandlist.each do |fullcmd|
       fullcfg = cmd(fullcmd)
-      next if fullcfg.lines[1..3].join =~ /(Parsing error at|command parse error)/ # Don't show for unsupported devices (e.g. FortiAnalyzer, FortiManager, FortiMail)
+      # Don't show for unsupported devices (e.g. FortiAnalyzer, FortiManager, FortiMail)
+      next if fullcfg.lines[1..3].join =~ /(Parsing error at|command parse error)/
 
       fullcfg.gsub! /(set comments "Error \(No order (found )?for (account )?ID \d+\) on).*/, '\\1 <stripped>"'
 

data/lib/oxidized/model/gaiaos.rb

@@ -26,7 +26,7 @@ class GaiaOS < Oxidized::Model
   # check for vsx / multiple context
   cmd 'show vsx' do |cfg|
     @is_vsx = cfg.include? 'VSX Enabled'
-    Oxidized.logger.debug cfg
+    logger.debug cfg
   end
 
   cmd 'show asset all' do |cfg|
@@ -46,7 +46,7 @@ class GaiaOS < Oxidized::Model
   end
 
   def single_context
-    Oxidized.logger.debug 'Single context tasks'
+    logger.debug 'Single context tasks'
     cmd 'show configuration' do |cfg|
       cfg.gsub! /^# Exported by \S+ on .*/, '# '
       cfg
@@ -54,7 +54,7 @@ class GaiaOS < Oxidized::Model
   end
 
   def multiple_context
-    Oxidized.logger.debug 'Multi context tasks'
+    logger.debug 'Multi context tasks'
     cmd 'show virtual-system all' do |systems|
       vs_items = systems.scan(/^(?<VSID>\d+)\s+(?<VSNAME>.*[^\s])/)
       allcfg = ''
@@ -62,7 +62,7 @@ class GaiaOS < Oxidized::Model
         allcfg += "\n\n\n#--------======== [ VS #{item[0]} - #{item[1]} ] ========--------\n\n"
         allcfg += "set virtual-system #{item[0]}\n\n"
         cmd "set virtual-system #{item[0]}" do |vs|
-          Oxidized.logger.debug vs
+          logger.debug vs
           cmd 'show configuration' do |vscfg|
             vscfg.gsub! /^# Exported by \S+ on .*/, '# '
             allcfg += vscfg

data/lib/oxidized/model/ingate.rb

@@ -0,0 +1,47 @@
+class Ingate < Oxidized::Model
+  using Refinements
+
+  cfg_cb = lambda do
+    cfg = @m.post(
+      @main_url,
+      {
+        'page'                                      => 'save',
+        'db.webgui.testmode/1/timelimit'            => '30',
+        'db.webgui.testmode/__KEEP_ROWS_ALIVE'      => '1',
+        'db.webgui.pending_apply/1/verbosity'       => 'always',
+        'db.webgui.pending_apply/__KEEP_ROWS_ALIVE' => '1',
+        'action.admin.download_config_cli'          => 'Save config to CLI file',
+        'upload.config_file;filename=type'          => 'application/octet-stream',
+        'upload.clicmd_file;filename;type'          => 'application/octet-stream',
+        'security'                                  => '',
+        'got_complete_form'                         => 'yes'
+      },
+      'Accept' => 'application/x-config-database'
+    )
+    cfg.body
+  end
+
+  cmd cfg_cb do |cfg|
+    cfg.gsub! /^# Timestamp:.*$/, ''
+    cfg
+  end
+
+  cfg :http do
+    @secure = true
+    @main_page = "/"
+    define_singleton_method :login do
+      @main_url = URI::HTTP.build host: @node.ip, path: @main_page
+      @m.post(
+        @main_url,
+        {
+          'security_user'     => @node.auth[:username],
+          'security_password' => @node.auth[:password],
+          'page'              => 'login',
+          'goal'              => 'save',
+          'got_complete_form' => 'yes',
+          'security'          => ''
+        }
+      )
+    end
+  end
+end

data/lib/oxidized/model/ios.rb

@@ -50,6 +50,7 @@ class IOS < Oxidized::Model
     cfg.gsub! /^( +client \S+ server-key \d) (.*)$/, '\\1 <secret hidden>'
     cfg.gsub! /^( +domain-password) \S+ ?(.*)/, '\\1 <secret hidden> \\2'
     cfg.gsub! /^( +pre-shared-key).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^(.*server-key(?: \d)?) \S+/, '\\1 <secret hidden>'
     cfg
   end
 
@@ -68,17 +69,25 @@ class IOS < Oxidized::Model
 
       comments << "Image:#{slave} Compiled: #{Regexp.last_match(1)}" if line =~ /^Compiled (.*)$/
 
-      comments << "Image:#{slave} Software: #{Regexp.last_match(1)}, #{Regexp.last_match(2)}" if line =~ /^(?:Cisco )?IOS .* Software,? \(([A-Za-z0-9_-]*)\), .*Version\s+(.*)$/
+      if line =~ /^(?:Cisco )?IOS .* Software,? \(([A-Za-z0-9_-]*)\), .*Version\s+(.*)$/
+        comments << "Image:#{slave} Software: #{Regexp.last_match(1)}, #{Regexp.last_match(2)}"
+      end
 
-      comments << "ROM Bootstrap: #{Regexp.last_match(3)}" if line =~ /^ROM: (IOS \S+ )?(System )?Bootstrap.*(Version.*)$/
+      if line =~ /^ROM: (IOS \S+ )?(System )?Bootstrap.*(Version.*)$/
+        comments << "ROM Bootstrap: #{Regexp.last_match(3)}"
+      end
 
       comments << "BOOTFLASH: #{Regexp.last_match(1)}" if line =~ /^BOOTFLASH: .*(Version.*)$/
 
       comments << "Memory: nvram #{Regexp.last_match(1)}" if line =~ /^(\d+[kK]) bytes of (non-volatile|NVRAM)/
 
-      comments << "Memory: flash #{Regexp.last_match(1)}" if line =~ /^(\d+[kK]) bytes of (flash memory|flash internal|processor board System flash|ATA CompactFlash)/i
+      if line =~ /^(\d+[kK]) bytes of (flash memory|flash internal|processor board System flash|ATA CompactFlash)/i
+        comments << "Memory: flash #{Regexp.last_match(1)}"
+      end
 
-      comments << "Memory: pcmcia #{Regexp.last_match(2)} #{Regexp.last_match(3)}#{Regexp.last_match(4)} #{Regexp.last_match(1)}" if line =~ /^(\d+[kK]) bytes of (Flash|ATA)?.*PCMCIA .*(slot|disk) ?(\d)/i
+      if line =~ /^(\d+[kK]) bytes of (Flash|ATA)?.*PCMCIA .*(slot|disk) ?(\d)/i
+        comments << "Memory: pcmcia #{Regexp.last_match(2)} #{Regexp.last_match(3)}#{Regexp.last_match(4)} #{Regexp.last_match(1)}"
+      end
 
       if line =~ /(\S+(?:\sseries)?)\s+(?:\(([\S ]+)\)\s+processor|\(revision[^)]+\)).*\s+with (\S+k) bytes/i
         sproc = Regexp.last_match(1)
@@ -119,7 +128,9 @@ class IOS < Oxidized::Model
     cmd cmd_line do |cfg|
       cfg = cfg.each_line.to_a[3..-1]
       cfg = cfg.reject { |line| line.match /^ntp clock-period / }.join
-      cfg = cfg.each_line.reject { |line| line.match /^! (Last|No) configuration change (at|since).*/ unless line =~ /\d+\sby\s\S+$/ }.join
+      cfg = cfg.each_line.reject do |line|
+        line.match /^! (Last|No) configuration change (at|since).*/ unless line =~ /\d+\sby\s\S+$/
+      end.join
       cfg.gsub! /^Current configuration : [^\n]*\n/, ''
       cfg.gsub! /^ tunnel mpls traffic-eng bandwidth[^\n]*\n*(
                     (?: [^\n]*\n*)*

data/lib/oxidized/model/ironware.rb

@@ -37,7 +37,7 @@ class IronWare < Oxidized::Model
     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'
+    cfg.gsub! /\d+\.\d deg-C/, 'XX.X deg-C'
     if cfg.include? "TEMPERATURE"
       sc = StringScanner.new cfg
       out = ''

data/lib/oxidized/model/junos.rb

@@ -32,6 +32,10 @@ class JunOS < Oxidized::Model
       out << cmd('show chassis fabric reachability') { |cfg| comment cfg }
     when /^(ex22|ex3[34]|ex4|ex8|qfx)/
       out << cmd('show virtual-chassis') { |cfg| comment cfg }
+    when /^srx/
+      out << cmd('show chassis cluster status') do |cfg|
+        cfg.lines.count <= 1 && cfg.include?("error:") ? '' : comment(cfg)
+      end
     end
     out
   end

data/lib/oxidized/model/linksyssrw.rb

@@ -8,7 +8,7 @@ class LinksysSRW < Oxidized::Model
   # Graphical login screen
   # Just login to get to Main Menu
   expect /Login Screen/ do
-    Oxidized.logger.send(:debug, "#{self.class.name}: Login Screen")
+    logger.debug "#{self.class.name}: Login Screen"
     # This is to ensure the whole thing have rendered before we send stuff
     sleep 0.2
     send 0x18.chr # CAN Cancel
@@ -21,14 +21,14 @@ class LinksysSRW < Oxidized::Model
 
   # Main menu, escape into Pre-cli-shell
   expect /Switch Main Menu/ do
-    Oxidized.logger.send(:debug, "#{self.class.name}: Switch menu")
+    logger.debug "#{self.class.name}: Switch menu"
     send 0x1a.chr # SUB Substitite ^z
     ''
   end
 
   # Pre-cli-shell, start lcli which is ios-ish
   expect />/ do
-    Oxidized.logger.send(:debug, "#{self.class.name}: >")
+    logger.debug "#{self.class.name}: >"
     send "lcli\r"
     ''
   end

data/lib/oxidized/model/mlnxos.rb

@@ -1,21 +1,27 @@
 class MLNXOS < Oxidized::Model
   using Refinements
 
-  prompt /([\w.@()-\[:\s\]]+[#>]\s)$/
+  prompt /^\r?(\e.+\e>\r)?\S* \[\S+: (master|standby)\] [#>] $/
   comment '## '
 
   # Pager Handling
-  expect /.+lines\s\d+-\d+([\s]|\/\d+\s\(END\)\s).+$/ do |data, re|
+  # "Normal" pager: "lines 183-204 "
+  # Last pager:     "lines 256-269/269 (END) "
+  expect /\e\[7mlines \d+-\d+( |\/\d+ \(END\) )/ do |data, re|
     send ' '
     data.sub re, ''
   end
 
+  # Remove ANSI escape codes
+  expect /\e\[[0-?]*[ -\/]*[@-~]\r?/ do |data, re|
+    data.sub re, ''
+  end
+
   cmd :all do |cfg|
-    cfg.gsub! /\[\?1h=\r/, '' # Pager Handling
-    cfg.gsub! /\[24;1H/, '' # Pager Handling
-    cfg.gsub! /\r\[K/, '' # Pager Handling
-    cfg.gsub! /\[K/, '' # Pager Handling
-    cfg.gsub! /\s/, '' # Linebreak Handling
+    cfg.gsub! "\e[m", '' # Remove reset formating
+    cfg.gsub! "\e[K", '' # Remove erase in line
+    cfg.gsub! /.\x08/, '' # Remove Backspace char
+    cfg.gsub! "\r", '' # Remove Cariage Return
     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
@@ -45,6 +51,7 @@ class MLNXOS < Oxidized::Model
 
   cfg :ssh do
     password /^Password:\s*/
+    post_login 'no cli session paging enable'
     pre_logout "\nexit"
   end
 end

data/lib/oxidized/model/model.rb

@@ -3,6 +3,7 @@ require_relative 'outputs'
 
 module Oxidized
   class Model
+    include SemanticLogger::Loggable
     using Refinements
 
     include Oxidized::Config::Vars
@@ -56,7 +57,7 @@ module Oxidized
         else
           process_args_block(@cmd[:cmd], args, [cmd_arg, block])
         end
-        Oxidized.logger.debug "lib/oxidized/model/model.rb Added #{cmd_arg} to the commands list"
+        logger.debug "Added #{cmd_arg} to the commands list"
       end
 
       def cmds
@@ -118,7 +119,7 @@ module Oxidized
     attr_accessor :input, :node
 
     def cmd(string, &block)
-      Oxidized.logger.debug "lib/oxidized/model/model.rb Executing #{string}"
+      logger.debug "Executing #{string}"
       out = @input.cmd(string)
       return false unless out
 
@@ -165,7 +166,7 @@ module Oxidized
     end
 
     def get
-      Oxidized.logger.debug 'lib/oxidized/model/model.rb Collecting commands\' outputs'
+      logger.debug 'Collecting commands\' outputs'
       outputs = Outputs.new
       procs = self.class.procs
       self.class.cmds[:cmd].each do |command, block|

data/lib/oxidized/model/netgear.rb

@@ -4,6 +4,12 @@ class Netgear < Oxidized::Model
   comment '!'
   prompt /^\(?[\w \-+.]+\)? ?[#>] ?$/
 
+  # Handle pager for "show version" on old Netgear models: #2394
+  expect /^--More-- or \(q\)uit$/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
   cmd :secret do |cfg|
     cfg.gsub!(/password (\S+)/, 'password <hidden>')
     cfg.gsub!(/encrypted (\S+)/, 'encrypted <hidden>')
@@ -53,5 +59,7 @@ class Netgear < Oxidized::Model
   cmd 'show running-config' do |cfg|
     cfg.gsub! /(System Up Time\s+).*/, '\\1 <removed>'
     cfg.gsub! /(Current SNTP Synchronized Time:).*/, '\\1 <removed>'
+    cfg.gsub! /(Current System Time:).*/, '\\1 <removed>'
+    cfg
   end
 end

data/lib/oxidized/model/nsxdfw.rb

@@ -8,7 +8,8 @@ class NSXDfw < Oxidized::Model
     domains.each do |domain|
       domain_config[domain['id']] = {}
       policies_data = cmd "/policy/api/v1/infra/domains/#{domain['id']}/security-policies/"
-      policies = JSON.parse(policies_data.encode('UTF-8', { invalid: :replace, undef: :replace, replace: '?' }))["results"]
+      policies = JSON.parse(policies_data.encode('UTF-8',
+                                                 { invalid: :replace, undef: :replace, replace: '?' }))["results"]
       policies_config = {}
       policies.each do |policy|
         rules_data = cmd "/policy/api/v1/infra/domains/#{domain['id']}/security-policies/#{policy['id']}/rules"

data/lib/oxidized/model/nsxfirewall.rb

@@ -8,7 +8,8 @@ class NSXFirewall < Oxidized::Model
     edges.each do |edge|
       firewall_config = cmd "/api/4.0/edges/#{edge['id']}/firewall/config"
       json_config = {}
-      json_config["#{edge['id']} #{edge['name']}"] = JSON.parse(firewall_config.encode('UTF-8', { invalid: :replace, undef: :replace, replace: '?' }))
+      json_config["#{edge['id']} #{edge['name']}"] =
+        JSON.parse(firewall_config.encode('UTF-8', { invalid: :replace, undef: :replace, replace: '?' }))
       data.push(json_config)
     end
     JSON.pretty_generate(data)

data/lib/oxidized/model/nxos.rb

@@ -22,11 +22,11 @@ class NXOS < Oxidized::Model
 
   cmd 'show version' do |cfg|
     cfg = filter cfg
-    cfg = cfg.each_line.take_while { |line| not line.match(/uptime/i) }
+    cfg = cfg.each_line.take_while { |line| not line.match(/uptime|bootflash:\s+\d+\skB|sysmgrcli_show_flash_size/i) }
     comment cfg.join
   end
 
-  cmd 'show inventory' do |cfg|
+  cmd 'show inventory all' do |cfg|
     cfg = filter cfg
     comment cfg
   end

data/lib/oxidized/model/openwrt.rb

@@ -38,26 +38,26 @@ class OpenWrt < Oxidized::Model
           filename = sysupgradefile.split('/')[-1]
           cfg << comment("#### File: #{sysupgradefile} #####")
           uciexport = cmd("uci export #{filename}")
-          Oxidized.logger.debug "Exporting uci config - #{filename}"
+          logger.debug "Exporting uci config - #{filename}"
           if vars(:remove_secret) && !(non_sensitive_files.include? filename)
-            Oxidized.logger.debug "Scrubbing uci config - #{filename}"
+            logger.debug "Scrubbing uci config - #{filename}"
             uciexport.gsub!(/^(\s+option\s+(password|key)\s+')[^']+'/, '\\1<secret hidden>\'')
           end
           cfg << uciexport
         end
       elsif binary_files.include? sysupgradefile
-        Oxidized.logger.debug "Exporting binary file - #{sysupgradefile}"
+        logger.debug "Exporting binary file - #{sysupgradefile}"
         cfg << comment("#### Binary file: #{sysupgradefile} #####")
         cfg << comment("Decode using 'echo -en <data> | gzip -dc > #{sysupgradefile}'")
         cfg << cmd("gzip -c #{sysupgradefile} | hexdump -ve '1/1 \"_x%.2x\"' | tr _ \\")
       elsif vars(:remove_secret) && sysupgradefile == '/etc/shadow'
-        Oxidized.logger.debug 'Exporting and scrubbing /etc/shadow'
+        logger.debug 'Exporting and scrubbing /etc/shadow'
         cfg << comment("#### File: #{sysupgradefile} #####")
         shadow = cmd("cat #{sysupgradefile}")
         shadow.gsub!(/^([^:]+:)[^:]*(:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:[^:]*:)/, '\\1\\2')
         cfg << shadow
       else
-        Oxidized.logger.debug "Exporting file - #{sysupgradefile}"
+        logger.debug "Exporting file - #{sysupgradefile}"
         cfg << comment("#### File: #{sysupgradefile} #####")
         cfg << cmd("cat #{sysupgradefile}")
       end
@@ -65,7 +65,7 @@ class OpenWrt < Oxidized::Model
     @mtdpartitions.scan(/(\w+):\s+\w+\s+\w+\s+"(.*)"/).each do |partition, name|
       next unless vars(:openwrt_backup_partitions) && partitions_to_backup.include?(name)
 
-      Oxidized.logger.debug "Exporting partition - #{name}(#{partition})"
+      logger.debug "Exporting partition - #{name}(#{partition})"
       cfg << comment("#### Partition: #{name} /dev/#{partition} #####")
       cfg << comment("Decode using 'echo -en <data> | gzip -dc > #{name}'")
       cfg << cmd("dd if=/dev/#{partition} 2>/dev/null | gzip -c | hexdump -ve '1/1 \"%.2x\"'")