oxidized 0.29.1 → 0.30.1

data/lib/oxidized/model/adtran.rb

@@ -14,7 +14,11 @@ class Adtran < Oxidized::Model
     cfg
   end
 
-  cmd 'show running-config'
+  cmd 'show running-config' do |cfg|
+    # Strip out line at the top which displays the current date/time
+    # ! Created                         : Mon Jun 26 2023 10:07:07
+    cfg.gsub! /! Createds+:.*\n/, ''
+  end
 
   cfg :ssh do
     if vars :enable

data/lib/oxidized/model/adva.rb

@@ -6,7 +6,7 @@
 class ADVA < Oxidized::Model
   using Refinements
 
-  prompt /\w+\-+[#>]\s?$/
+  prompt /\w+-+[#>]\s?$/
   comment '# '
 
   cmd :secret do |cfg|
@@ -18,7 +18,7 @@ class ADVA < Oxidized::Model
     cfg.cut_both
   end
 
-  cmd 'show running-config current' do |cfg|
+  cmd 'show running-config delta' do |cfg|
     cfg.each_line.reject { |line| line.match /^Preparing configuration file.*/ }.join
   end
 

data/lib/oxidized/model/aoscx.rb

@@ -58,6 +58,7 @@ class Aoscx < Oxidized::Model
     cfg.gsub! /^(\d\/\d\/\d.*\s+)\d+\s+$/, '\\1<hidden>'
     cfg.gsub! /^(\d+\/\S+\s+\S+\s+)\d+\.\d+\s+C(.*)/, '\\1<hidden>\\2'
     cfg.gsub! /^(LC.*\s+)\d+\.\d+\s+(C.*)$/, '\\1 <hidden> \\2'
+    cfg.gsub! /^(\S+\s+\S+\s+\s+\S+\s+)(slow|normal|medium|fast|max)(\s+\S+\s+\S+\s+)\d+/, '\\1<speed>\\3<rpm>'
     comment cfg
   end
 
@@ -69,7 +70,7 @@ class Aoscx < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show system | exclude "Up Time" | exclude "CPU" | exclude "Memory"' do |cfg|
+  cmd 'show system | exclude "Up Time" | exclude "CPU" | exclude "Memory" | exclude "Pkts .x" | exclude "Lowest" | exclude "Missed"' do |cfg|
     comment cfg
   end
 

data/lib/oxidized/model/apc_aos.rb

@@ -2,7 +2,8 @@ class Apc_aos < Oxidized::Model # rubocop:disable Naming/ClassAndModuleCamelCase
   using Refinements
 
   cmd 'config.ini' do |cfg|
-    cfg.gsub! /^; Configuration file, generated on.*/, ''
+    cfg.gsub!(/^; Configuration file, generated on.*\n/, '')
+    cfg
   end
 
   cfg :ftp do

data/lib/oxidized/model/aricentiss.rb

@@ -2,6 +2,10 @@
 # #show version
 # Switch ID       Hardware Version                Firmware Version
 # 0               SSE-G48-TG4   (P2-01)           1.0.16-9
+# and
+# # show version
+# Switch ID       Hardware Version                Firmware Version
+# 0               MBM-XEM-002  (B6-01)            2.1.3-25
 
 class AricentISS < Oxidized::Model
   using Refinements
@@ -13,6 +17,9 @@ class AricentISS < Oxidized::Model
     # 1.0.18-15 is known to include the corrected spelling
     post_login 'no cli pagination'
     post_login 'no cli pagignation'
+    # Starting firmware 2.0, pagination is done differently.
+    # This configuration is reset after the session ends.
+    post_login 'conf t; set cli pagination off; exit'
     pre_logout 'exit'
   end
 

data/lib/oxidized/model/asternos.rb

@@ -0,0 +1,22 @@
+class AsterNOS < Oxidized::Model
+  using Refinements
+
+  prompt /^[^\$]+\$/
+  comment '# '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd 'show version' do |cfg|
+    # @model = Regexp.last_match(1) if cfg =~ /^Model: (\S+)/
+    comment cfg
+  end
+
+  cmd "show runningconfiguration all"
+
+  cfg :ssh do
+    # exec true
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/asyncos.rb

@@ -25,9 +25,9 @@ class AsyncOS < Oxidized::Model
     # Delete hour and date which change each run
     # cfg.gsub! /\sCurrent Time: \S+\s\S+\s+\S+\s\S+\s\S+/, ' Current Time:'
     # Delete select passphrase display option
-    cfg.gsub! /Choose the passphrase option:/, ''
+    cfg.gsub! "Choose the passphrase option:", ''
     cfg.gsub! /1. Mask passphrases \(Files with masked passphrases cannot be loaded using/, ''
-    cfg.gsub! /loadconfig command\)/, ''
+    cfg.gsub! "loadconfig command)", ''
     cfg.gsub! /2. Encrypt passphrases/, ''
     cfg.gsub! /3. Plain passphrases/, ''
     cfg.gsub! /^3$/, ''

data/lib/oxidized/model/awplus.rb

@@ -15,8 +15,8 @@ class AWPlus < Oxidized::Model
 
   # Removes gibberish pager output e.g. VT100 escape codes
   cmd :all do |cfg|
-    cfg.gsub! /\e\[K/, ''         # example how to handle pager - cleareol EL0
-    cfg.gsub! /\e\[7m\e\[m/, ''   # example how to handle pager - Reverse SGR7
+    cfg.gsub! "\e[K", '' # example how to handle pager - cleareol EL0
+    cfg.gsub! "\e[7m\e[m", '' # example how to handle pager - Reverse SGR7
     cfg.delete! "\r" # Filters rogue ^M - see issue #415
     cfg.cut_both
   end

data/lib/oxidized/model/bdcom.rb

@@ -47,5 +47,6 @@ class BDCOM < Oxidized::Model
 
     post_login 'terminal length 0'
     pre_logout 'exit'
+    pre_logout 'exit'
   end
 end

data/lib/oxidized/model/c4cmts.rb

@@ -18,8 +18,7 @@ class C4CMTS < Oxidized::Model
     cfg
   end
 
-  cmd 'show environment' do |cfg|
-    cfg.gsub! /\s+[\-\d]+\s+C\s+[(\s\d]+\s+F\)/, '' # remove temperature readings
+  cmd 'show factory-eeprom' do |cfg|
     comment cfg.cut_both
   end
 

data/lib/oxidized/model/ciscosma.rb

@@ -25,7 +25,7 @@ class CiscoSMA < Oxidized::Model
     # Delete hour and date which change each run
     # cfg.gsub! /\sCurrent Time: \S+\s\S+\s+\S+\s\S+\s\S+/, ' Current Time:'
     # Delete select passphrase display option
-    cfg.gsub! /Do you want to mask the password\? Files with masked passwords cannot be loaded/, ''
+    cfg.gsub! "Do you want to mask the password? Files with masked passwords cannot be loaded", ''
     cfg.gsub! /^\s+y/, ''
     # Delete space
     cfg.gsub! /\n\s{25}/, ''

data/lib/oxidized/model/ciscosmb.rb

@@ -5,7 +5,12 @@ class CiscoSMB < Oxidized::Model
   # http://www.cisco.com/c/en/us/support/switches/small-business-300-series-managed-switches/products-release-notes-list.html
 
   prompt /^\r?([\w.@()-]+[#>]\s?)$/
-  comment  '! '
+  comment '! '
+
+  expect '^.*Your password has exceeded the maximum lifetime.*$' do
+    send 'N'
+    ""
+  end
 
   cmd :all do |cfg|
     lines = cfg.each_line.to_a[1..-2]

data/lib/oxidized/model/comware.rb

@@ -27,7 +27,7 @@ class Comware < Oxidized::Model
   end
 
   cfg :telnet do
-    username /^(Username|login):/
+    username /^(Username|[Ll]ogin):/
     password /^Password:/
   end
 
@@ -37,7 +37,7 @@ class Comware < Oxidized::Model
       if vars(:enable) == true
         cmd "super"
       elsif vars(:enable)
-        cmd "super", /^ [pP]assword:/
+        cmd "super", /^\s?[pP]assword:/
         cmd vars(:enable)
       end
     end

data/lib/oxidized/model/cumulus.rb

@@ -1,7 +1,7 @@
 class Cumulus < Oxidized::Model
   using Refinements
 
-  prompt /^((\w*)@(.*)):/
+  prompt /^(([\w.-]*)@(.*)):/
   comment '# '
 
   # add a comment in the final conf

data/lib/oxidized/model/dellx.rb

@@ -7,7 +7,7 @@ class DellX < Oxidized::Model
 
   comment '! '
 
-  expect /(^.*)?+[mM]ore\:+.*$/ do |data, re|
+  expect /(^.*)?+[mM]ore:+.*$/ do |data, re|
     send ' '
     data.sub re, ''
   end

data/lib/oxidized/model/dlink.rb

@@ -2,9 +2,8 @@ class Dlink < Oxidized::Model
   using Refinements
 
   # D-LINK Switches
-  # Add support dgs 1100 series (tested only with dgs-1100-10/me)
 
-  prompt /^(\r*[\w\s.@()\/:-]+[#>]\s?)$/
+  prompt /[\w.@()\/:-]+[#>]\s?$/
   comment '# '
 
   cmd :secret do |cfg|
@@ -19,6 +18,9 @@ class Dlink < Oxidized::Model
 
   cmd 'show switch' do |cfg|
     cfg.gsub! /^System Uptime\s.+/, '' # Omit constantly changing uptime info
+    cfg.gsub! /^System up time\s.+/, '' # Omit constantly changing uptime info
+    cfg.gsub! /^System Time\s.+/, '' # Omit constantly changing uptime info
+    cfg.gsub! /^RTC Time\s.+/, '' # Omit constantly changing uptime info
     comment cfg
   end
 

data/lib/oxidized/model/dlinknextgen.rb

@@ -0,0 +1,51 @@
+class DlinkNextGen < Oxidized::Model
+  using Refinements
+
+  # D-LINK next generation cli Switches
+  # Add support DXS-1210-12SC
+
+  prompt /[\w.@()\/-]+[#>]\s?$/
+  comment '# '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[2..-2].map { |line| line.delete("\r").rstrip }.join("\n") + "\n"
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /(password) (\S+).*/, '\\1 <secret hidden>'
+    cfg.gsub! /(snmp-server group) (\S+) (v.*)/, '\\1 <secret hidden> \\3'
+    cfg.gsub! /(snmp-server community) (\S+) (v.*)/, '\\1 <secret hidden> \\3'
+    cfg
+  end
+
+  # "show switch" doesn't exist on DXS-1210-28T rev A1 Firmware: Build 1.00.024; not figured out how to run "show version" so running both
+  cmd 'show switch' do |cfg|
+    cfg.gsub! /^\s+System Time\s.+/, '' # Omit constantly changing uptime info
+    comment cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show vlan' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg.gsub! /^(snmp-server community ["\w]+) \S+/, '\\1 <removed>'
+    cfg.gsub! /^(username [\w.@-]+ privilege \d{1,2} password \d{1,2}) \S+/, '\\1 <removed>'
+    cfg
+  end
+
+  cfg :telnet do
+    username /\r*([\w\s.@()\/:-]+)?([Uu]ser[Nn]ame|[Ll]ogin):/
+    password /\r*[Pp]ass[Ww]ord:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'terminal length 0'
+    post_login 'terminal width 255'
+    pre_logout 'logout'
+  end
+end

data/lib/oxidized/model/dnos.rb

@@ -16,6 +16,9 @@ class DNOS < Oxidized::Model
     cfg.gsub! /secret (\d+) (\S+).*/, '<secret hidden>'
     cfg.gsub! /password (\d+) (\S+).*/, '<secret hidden>'
     cfg.gsub! /^(tacacs-server key \d+) (\S+).*/, '\\1 <secret hidden>'
+    cfg.gsub! /(ip ospf message-digest-key \d \S+ \d).*/, '\\1 <secret hidden>'
+    cfg.gsub! /(authentication-type).*/, '\\1 <secret hidden>'
+    cfg.gsub! /^(bsd-username \S+ secret).*/, '\\1 <secret hidden>'
     cfg
   end
 

data/lib/oxidized/model/edgecos.rb

@@ -31,7 +31,7 @@ class EdgeCOS < Oxidized::Model
 
   cmd 'show system' do |cfg|
     cfg.gsub! /^.*\sUp Time\s*:.*\n/i, ''
-    cfg.gsub! /^(.*\sTemperature \d*:).*\n/i, '\\1 <removed>'
+    cfg.gsub! /^(.*\sTemperature \d*\s*:\s*).*/i, '\\1<removed>'
     comment cfg
   end
 

data/lib/oxidized/model/eltex.rb

@@ -44,6 +44,8 @@ class Eltex < Oxidized::Model
       end
     end
     post_login 'terminal datadump'
+    # disable cli pagination for MES2424
+    post_login 'set cli pagination off'
     pre_logout 'disable'
     pre_logout 'exit'
   end

data/lib/oxidized/model/enterasys800.rb

@@ -23,7 +23,7 @@ class Enterasys800 < Oxidized::Model
   cmd :all do |cfg|
     cfg = cfg.cut_both
     cfg = cfg.gsub /^[\r\n]|^\s\s\s/, ''
-    cfg = cfg.gsub /Command: show config effective/, ''
+    cfg = cfg.gsub "Command: show config effective", ''
     cfg
   end
 

data/lib/oxidized/model/eos.rb

@@ -15,7 +15,7 @@ class EOS < Oxidized::Model
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
     cfg.gsub! /(secret \w+) (\S+).*/, '\\1 <secret hidden>'
     cfg.gsub! /(password \d+) (\S+).*/, '\\1 <secret hidden>'
-    cfg.gsub! /^(enable secret).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^(enable (?:secret|password)).*/, '\\1 <configuration removed>'
     cfg.gsub! /^(service unsupported-transceiver).*/, '\\1 <license key removed>'
     cfg.gsub! /^(tacacs-server key \d+).*/, '\\1 <configuration removed>'
     cfg.gsub! /( {6}key) (\h+ 7) (\h+).*/, '\\1 <secret hidden>'

data/lib/oxidized/model/firebrick.rb

@@ -10,8 +10,8 @@ class Firebrick < Oxidized::Model
   end
 
   cmd 'show status' do |cfg|
-    cfg.gsub! /Status/, ''
-    cfg.gsub! /------/, ''
+    cfg.gsub! "Status", ''
+    cfg.gsub! "------", ''
     cfg.gsub! /Uptime.*/, ''
     cfg.gsub! /Current time.*/, ''
     cfg.gsub! /RAM.*/, ''

data/lib/oxidized/model/firewareos.rb

@@ -1,7 +1,7 @@
 class FirewareOS < Oxidized::Model
   using Refinements
 
-  prompt /^\[?\w*\]?\w*?(<\w*>)?(#|>)\s*$/
+  prompt /^\[?\w*\]?\w*?(<[\w-]*>)?(#|>)\s*$/
   comment  '-- '
 
   cmd :all do |cfg|

data/lib/oxidized/model/fortios.rb

@@ -5,6 +5,12 @@ class FortiOS < Oxidized::Model
 
   prompt /^([-\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|
+    send 'a'
+    data.sub re, ''
+  end
+
   expect /^--More--\s$/ do |data, re|
     send ' '
     data.sub re, ''
@@ -23,6 +29,7 @@ class FortiOS < Oxidized::Model
     cfg.gsub! /(set (?:passwd|password|key|group-password|auth-password-l1|auth-password-l2|rsso|history0|history1)) .+/, '\\1 <configuration removed>'
     cfg.gsub! /(set md5-key [0-9]+) .+/, '\\1 <configuration removed>'
     cfg.gsub! /(set private-key ).*?-+END (ENCRYPTED|RSA|OPENSSH) PRIVATE KEY-+\n?"$/m, '\\1<configuration removed>'
+    cfg.gsub! /(set privatekey ).*?-+END (ENCRYPTED|RSA|OPENSSH) PRIVATE KEY-+\n?"$/m, '\\1<configuration removed>'
     cfg.gsub! /(set ca )"-+BEGIN.*?-+END CERTIFICATE-+"$/m, '\\1<configuration removed>'
     cfg.gsub! /(set csr ).*?-+END CERTIFICATE REQUEST-+"$/m, '\\1<configuration removed>'
     cfg
@@ -38,7 +45,7 @@ class FortiOS < Oxidized::Model
     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'
-    cfg.gsub! /(Virus-DB|Extended DB|IPS-DB|IPS-ETDB|APP-DB|INDUSTRIAL-DB|Botnet DB|IPS Malicious URL Database|AV AI\/ML Model|IoT-Detect).*/, '\\1 <db version stripped>'
+    cfg.gsub! /(Virus-DB|Extended DB|FMWP-DB|IPS-DB|IPS-ETDB|APP-DB|INDUSTRIAL-DB|Botnet DB|IPS Malicious URL Database|AV AI\/ML Model|IoT-Detect).*/, '\\1 <db version stripped>'
     comment cfg
   end
 
@@ -66,7 +73,7 @@ class FortiOS < Oxidized::Model
 
     cfg << cmd('end') if @vdom_enabled
 
-    ['show full-configuration | grep .', 'show full-configuration', 'show'].each do |fullcmd|
+    ['show | grep .', 'show full-configuration', 'show'].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)
 

data/lib/oxidized/model/fsos.rb

@@ -0,0 +1,44 @@
+class FSOS < Oxidized::Model
+  # Fiberstore / fs.com
+  using Refinements
+  comment '! '
+
+  # Handle paging
+  expect /^ --More--.*$/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /(secret \w+) (\S+).*/, '\\1 <secret hidden>'
+    cfg.gsub! /(password \d+) (\S+).*/, '\\1 <secret hidden>'
+    cfg.gsub! /(snmp-server community \d+) (\S+).*/, '\\1 <secret hidden>'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    # Remove uptime so the result doesn't change every time
+    cfg.gsub! /.*uptime is.*\n/, ''
+    cfg.gsub! /.*System uptime.*\n/, ''
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    # Remove "Building configuration..." message
+    cfg.gsub! /^Building configuration.*\n/, ''
+    cfg.cut_head
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'enable'
+    post_login 'terminal length 0'
+    post_login 'terminal width 256'
+    pre_logout 'exit'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/ios.rb

@@ -85,7 +85,7 @@ class IOS < Oxidized::Model
         comments << "Processor ID: #{Regexp.last_match(1)}" if cfg.lines[i + 1] =~ /processor board id (\S+)/i
         if cfg.lines[i + 2] =~ /(cpu at |processor: |#{cpu} processor,)/i
           # change implementation to impl and prepend comma
-          cpuxtra = cfg.lines[i + 2].gsub(/implementation/, 'impl').gsub(/^/, ', ').chomp
+          cpuxtra = cfg.lines[i + 2].gsub("implementation", 'impl').gsub(/^/, ', ').chomp
         end
         comments << "CPU:#{slave} #{cpu}#{cpuxtra}#{slaveslot}"
       end

data/lib/oxidized/model/iosxr.rb

@@ -16,7 +16,7 @@ class IOSXR < Oxidized::Model
     cfg
   end
 
-  cmd 'show inventory' do |cfg|
+  cmd 'admin show inventory' do |cfg|
     comment cfg
   end
 
@@ -25,7 +25,7 @@ class IOSXR < Oxidized::Model
   end
 
   cmd 'show running-config' do |cfg|
-    cfg = cfg.each_line.to_a[3..-1].join
+    cfg = cfg.each_line.to_a[1..-1].join
     cfg
   end
 

data/lib/oxidized/model/junos.rb

@@ -1,6 +1,5 @@
 class JunOS < Oxidized::Model
   using Refinements
-
   comment '# '
 
   def telnet
@@ -10,11 +9,13 @@ class JunOS < Oxidized::Model
   cmd :all do |cfg|
     cfg = cfg.cut_both if screenscrape
     cfg.gsub!(/  scale-subscriber (\s+)(\d+)/, '  scale-subscriber                <count>')
+    cfg.gsub!(/VMX-BANDWIDTH\s+(\d+) (.*)/, 'VMX-BANDWIDTH                  <count> \2')
     cfg.lines.map { |line| line.rstrip }.join("\n") + "\n"
   end
 
   cmd :secret do |cfg|
     cfg.gsub!(/community (\S+) {/, 'community <hidden> {')
+    cfg.gsub!(/(ssh-(rsa|dsa|ecdsa|ecdsa-sk|ed25519|ed25519-sk) )".*; ## SECRET-DATA/, '<secret removed>')
     cfg.gsub!(/ "\$\d\$\S+; ## SECRET-DATA/, ' <secret removed>;')
     cfg
   end
@@ -29,7 +30,7 @@ class JunOS < Oxidized::Model
     case @model
     when 'mx960'
       out << cmd('show chassis fabric reachability') { |cfg| comment cfg }
-    when /^(ex22|ex33|ex4|ex8|qfx)/
+    when /^(ex22|ex3[34]|ex4|ex8|qfx)/
       out << cmd('show virtual-chassis') { |cfg| comment cfg }
     end
     out

data/lib/oxidized/model/mimosab11.rb

@@ -0,0 +1,34 @@
+begin
+  # Mechanize has to be intialized here as the login needs a POST request
+  require "mechanize"
+rescue LoadError
+  # Oxidized requires mechanize
+  raise Oxidized::OxidizedError, "mechanize not found: sudo gem install mechanize"
+end
+
+class Mimosab11 < Oxidized::Model
+  using Refinements
+  # Callback cfg_cb function to login(POST) then get(GET) the configuration
+  cfg_cb = lambda do
+    @e = Mechanize.new
+    # Set login query endpoint(lqe) and login POST data(lqp)
+    lqe = "https://#{@node.ip}/?q=index.login&mimosa_ajax=1"
+    lgp = { "username" => "configure", "password" => @password }
+    # Set get request endpoint(gc) for config
+    gc = "https://#{@node.ip}/?q=preferences.configure&mimosa_action=download"
+    # Not to verify self signed
+    @e.verify_mode = 0
+    @e.post(lqe, lgp)
+    cfg = @e.get(gc)
+    cfg.body
+  end
+
+  cmd cfg_cb do |cfg|
+    cfg
+  end
+
+  cfg :http do
+    @username = @node.auth[:username]
+    @password = @node.auth[:password]
+  end
+end

data/lib/oxidized/model/ml66.rb

@@ -0,0 +1,33 @@
+class ML66 < Oxidized::Model
+  comment '! '
+  prompt /.*#/
+
+  expect /User:.*$/ do |data, re|
+    send "admin_user\n"
+    send "#{@node.auth[:password]}\n"
+    data.sub re, ''
+  end
+
+  cmd 'show version' do |cfg|
+    cfg.gsub! "Uptime", ''
+    comment cfg
+  end
+
+  cmd 'show inventory hw all' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show inventory sw all' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show license status all' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config'
+
+  cfg :ssh do
+    pre_logout 'logout'
+  end
+end

data/lib/oxidized/model/model.rb

@@ -143,8 +143,8 @@ module Oxidized
       @input.send data
     end
 
-    def expect(regex, &block)
-      self.class.expect regex, &block
+    def expect(...)
+      self.class.expect(...)
     end
 
     def cfg
@@ -217,7 +217,7 @@ module Oxidized
 
     def process_cmd_output(output, name)
       output = String.new('') unless output.instance_of?(String)
-      output.set_cmd(name)
+      output.process_cmd(name)
       output
     end
   end

data/lib/oxidized/model/netgear.rb

@@ -2,7 +2,7 @@ class Netgear < Oxidized::Model
   using Refinements
 
   comment '!'
-  prompt /^(\([\w\s\-.]+\)\s[#>])$/
+  prompt /^(\([\w\s\-\+.]+\)\s?[#>])$/
 
   cmd :secret do |cfg|
     cfg.gsub!(/password (\S+)/, 'password <hidden>')

data/lib/oxidized/model/netscaler.rb

@@ -1,7 +1,7 @@
 class NetScaler < Oxidized::Model
   using Refinements
 
-  prompt /^([\w\.-]*>\s?)$/
+  prompt /^(.*[\w\.-]*>\s?)$/
   comment '# '
 
   cmd :all do |cfg|

data/lib/oxidized/model/nxos.rb

@@ -10,11 +10,12 @@ class NXOS < Oxidized::Model
   end
 
   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! /^(snmp-server community).*/, '\\1 <secret hidden>'
+    cfg.gsub! /^(snmp-server user (\S+) (\S+) auth (\S+)) (\S+) (priv) (\S+)/, '\\1 <secret hidden> '
+    cfg.gsub! /^(snmp-server host.*? )\S+( udp-port \d+)?$/, '\\1<secret hidden>\\2'
     cfg.gsub! /(password \d+) (\S+)/, '\\1 <secret hidden>'
     cfg.gsub! /^(radius-server key).*/, '\\1 <secret hidden>'
-    cfg.gsub! /^(tacacs-server host .+ key(?: \d+)?) \S+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(tacacs-server .*key(?: \d+)?) \S+/, '\\1 <secret hidden>'
     cfg
   end