oxidized 0.33.0 → 0.34.0

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

@@ -59,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\"'")

data/lib/oxidized/model/procurve.rb

@@ -75,7 +75,9 @@ class Procurve < Oxidized::Model
 
   # not supported on all models
   cmd 'show system information' do |cfg|
-    cfg = cfg.each_line.reject { |line| line.match /(.*CPU.*)|(.*Up Time.*)|(.*Total.*)|(.*Free.*)|(.*Lowest.*)|(.*Missed.*)/ }
+    cfg = cfg.each_line.reject do |line|
+      line.match /(.*CPU.*)|(.*Up Time.*)|(.*Total.*)|(.*Free.*)|(.*Lowest.*)|(.*Missed.*)/
+    end
     cfg = cfg.join
     comment cfg
   end

data/lib/oxidized/model/qtech.rb

@@ -16,7 +16,9 @@ class QTECH < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
-    comment cfg.each_line.reject { |line| line.match /^  (Copyright |All rights reserved$|Uptime is |Last reboot is )/ }.join
+    comment cfg.each_line.reject { |line|
+      line.match /^  (Copyright |All rights reserved$|Uptime is |Last reboot is )/
+    }.join
   end
 
   cmd 'show running-config' do |cfg|

data/lib/oxidized/model/quantaos.rb

@@ -1,15 +1,17 @@
 class QuantaOS < Oxidized::Model
   using Refinements
 
-  prompt /^\((\w|\S)+\) (>|#)$/
+  prompt /^\(\S+\) (>|#)$/
   comment '! '
 
+  cmd :all do |cfg|
+    # Remove command echo and prompt
+    cfg.cut_both
+  end
+
   cmd 'show run' do |cfg|
-    cfg.each_line.select do |line|
-      (not line.match /^!.*$/) &&
-        (not line.match /^\((\w|\S)+\) (>|#)$/) &&
-        (not line.match /^show run$/)
-    end.join
+    # Remove commented lines
+    cfg.lines.grep_v(/^!/).join
   end
 
   cfg :telnet do

data/lib/oxidized/model/routeros.rb

@@ -11,7 +11,7 @@ class RouterOS < Oxidized::Model
       cfg.gsub! /^\r+(.+)/, '\1'
       cfg.gsub! /([^\r]*)\r+$/, '\1'
     end
-    cfg
+    cfg.lines.map { |line| line.rstrip }.join("\n") + "\n" # strip trailing whitespace
   end
 
   cmd '/system resource print' do |cfg|
@@ -30,7 +30,7 @@ class RouterOS < Oxidized::Model
   end
 
   post do
-    Oxidized.logger.debug "lib/oxidized/model/routeros.rb: running /export for routeros version #{@ros_version}"
+    logger.debug "Running /export for routeros version #{@ros_version}"
     run_cmd = if vars(:remove_secret)
                 '/export hide-sensitive'
               elsif (not @ros_version.nil?) && (@ros_version >= 7)
@@ -45,6 +45,7 @@ class RouterOS < Oxidized::Model
       cfg.gsub! "# poe-out status: short_circuit\r\n", '' # Remove intermittent POE short_circuit comment
       cfg.gsub! "# Firmware upgraded successfully, please reboot for changes to take effect!\r\n", '' # Remove transient firmware upgrade comment
       cfg.gsub! /# \S+ not ready\r\n/, '' # Remove intermittent $interface not ready comment
+      cfg.gsub! /# .+ please restart the device in order to apply the new setting\r\n/, '' # Remove intermittent restart needed comment. (e.g. for ipv6 settings)
       cfg = cfg.split("\n")
       cfg.reject! { |line| line[/^#\s\w{3}\/\d{2}\/\d{4}.*$/] } # Remove date time and 'by RouterOS' comment (v6)
       cfg.reject! { |line| line[/^#\s\d{4}-\d{2}-\d{2}.*$/] }   # Remove date time and 'by RouterOS' comment (v7)

data/lib/oxidized/model/saos10.rb

@@ -0,0 +1,38 @@
+class SAOS10 < Oxidized::Model
+  using Refinements
+  # Ciena SAOS switch
+  # used for 10.x devices
+
+  prompt /^[\w\-]+\*?> ?$/
+  comment  '# '
+
+  cmd :all do |cfg|
+    cfg.cut_both
+  end
+
+  cmd('show system hostname') { |cfg| comment cfg }
+
+  cmd('show software') { |cfg| comment cfg }
+
+  cmd('show system components') { |cfg| comment cfg }
+
+  cmd('show system health') { |cfg| comment cfg }
+
+  cmd('show system last-reset-reasons') { |cfg| comment cfg }
+
+  cmd 'show running config' do |cfg|
+    cfg.gsub! /^! Created: [^\n]*\n/, ''
+    cfg.gsub! /^! On terminal: [^\n]*\n/, ''
+    cfg
+  end
+
+  cfg :telnet do
+    username /login:/
+    password /assword:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'set session more off'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/sixwind.rb

@@ -0,0 +1,28 @@
+class SixWind < Oxidized::Model
+  using Refinements
+
+  prompt /^[\w\s\(\).@_\/:-]+[>] $/
+  comment '# '
+
+  cmd :all do |cfg|
+    cfg.cut_both
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub!(/(?<!  {1})(?:password|secret) (?:\d )?\S+/, '\\1 <secret hidden>') # double space to exclude radius password template
+    cfg
+  end
+
+  cmd 'show product version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show config' do |cfg|
+    cfg
+  end
+
+  cfg :ssh do
+    post_login 'cliconfig pager enabled false'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/sonicos.rb

@@ -56,7 +56,7 @@ class SonicOS < Oxidized::Model
       next if line =~ /date \d{4}:\d{2}:\d{2}/
       next if line =~ /time \d{2}:\d{2}:\d{2}/
       next if line =~ /system-time "\d{2}\/\d{2}\/\d{4} \d{2}:\d{2}:\d{2}.\d+"/
-      next if line =~ /system-uptime "((\s+up\s+\d+\s+)|(\d+\s\w+(,\s)?)*)"/
+      next if line =~ /system-uptime "(?:\s+up\s+\d+\s+|\d+ \w+(?:, \d+ \w+)*)"/
       next if line =~ /checksum \d+/
 
       line = line[1..-1] if line[0] == "\r"

data/lib/oxidized/model/supermicro.rb

@@ -5,6 +5,6 @@ require_relative 'edgecos'
 
 Supermicro = EdgeCOS
 
-Oxidized.logger.warn "Using deprecated model supermicro, use edgecos instead."
+logger.warn "Using deprecated model supermicro, use edgecos instead."
 
 # Deprecated

data/lib/oxidized/model/timos.rb

@@ -5,6 +5,6 @@ require_relative 'sros'
 
 TiMOS = SROS
 
-Oxidized.logger.warn "Using deprecated model timos, use sros instead."
+logger.warn "Using deprecated model timos, use sros instead."
 
 # Deprecated

data/lib/oxidized/model/tmos.rb

@@ -32,6 +32,7 @@ class TMOS < Oxidized::Model
     cfg.gsub!(/^\s+bandwidth-bps (\d+)/, '')
     cfg.gsub!(/^\s+bandwidth-cps (\d+)/, '')
     cfg.gsub!(/^\s+bandwidth-pps (\d+)\n/, '')
+    cfg.gsub!(/^\s*\S*encrypted \S+\n/, '')
     cfg
   end
 

data/lib/oxidized/model/tnsr.rb

@@ -0,0 +1,53 @@
+class TNSR < Oxidized::Model
+  using Refinements
+
+  # Netgate TNSR #
+
+  # prompt examples
+  # https://docs.netgate.com/tnsr/en/latest/basics/working-cli.html#command-prompt
+  #  "<hostname> tnsr<(mode)># " <-- with trailing whitespace
+  #  tnsr-dev-25-02 tnsr#
+  #  tnsr-dev-25-02 tnsr(config)#  <-- after "configure terminal", but this is not important for oxidized
+  # prompt from debug log
+  #  received "Welcome to Netgate TNSR Version: 25.02-2\r\n\r\n\t* Documentation:  https://docs.netgate.com/tnsr/en/latest/\r\n\t* Support:        https://www.netgate.com/support\r\n\r\n   _          __________\r\n _| |_ _ __  | ___ _ __ |\r\n|_  __| '_ \\ |/ __| '__||\r\n  | |_| | | ||\\__ \\ |   |\r\n   \\__|_| |_|||___/_|   |\r\n             |__________|\r\n\r\n\r\n"
+  #  received "\r\nVersion: 25.02-2\r\n\r\nFor information see 'show documentation'\r\n\r\n"
+  #  received "\rbgp01 tnsr# "
+  # when the --More-- pager is the last line of paged output, the prompt contains \x08\x20\x08 orphans on the begin
+  #  you can look for context into spec simulation:
+  #    spec/model/data/tnsr:TNSR_24.10-3_short-config:simulation.yaml
+  #    spec/model/data/tnsr:TNSR_25.02-2_long-config-and-pager-at-last-line:simulation.yaml
+  prompt /^((\x08{8}\x20{8}\x08{8})?\r?[\w-]+\stnsr#\s?)$/
+
+  comment '! '
+
+  expect /^--More--/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    # remove orphans \r
+    cfg.gsub! /^\r+(.+)/, '\1'
+    # handle pager orphans ^H^H^H^H^H^H^H^H        ^H^H^H^H^H^H^H^H
+    cfg.gsub! /\x08{8}\x20{8}\x08{8}/, ''
+    cfg.cut_both
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /(password( \d+)?) (\S+).*/, '\\1 <secret hidden>'
+    cfg.gsub! /^(snmp community community-name )\S+ (.*)?/, '\\1 <configuration removed> \\2'
+    cfg
+  end
+
+  cmd 'show version all' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show configuration running cli' do |cfg|
+    cfg
+  end
+
+  cfg :telnet, :ssh do
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/trango.rb

@@ -18,7 +18,9 @@ class Trango < Oxidized::Model
       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+)/
+      if line =~ /\[(Hardware Version|Firmware Version|Model|S\/N)\] (\S+)/
+        comments << ('# ' + Regexp.last_match[1] + ': ' + Regexp.last_match[2])
+      end
       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/

data/lib/oxidized/model/unifiap.rb

@@ -31,7 +31,9 @@ class Unifiap < Oxidized::Model
 
   # Next see if we can get our IP and host name out of /etc/hosts
   cmd 'cat /etc/hosts' do |cfg|
-    cfg = cfg.split("\n").reject { |line| line[/^\s*(127|0000:0000:0000:0000:0000:0000:0000:0001|0:0:0:0:0:0:0:1|::1)/] }
+    cfg = cfg.split("\n").reject do |line|
+      line[/^\s*(127|0000:0000:0000:0000:0000:0000:0000:0001|0:0:0:0:0:0:0:1|::1)/]
+    end
     cfg.select do |line|
       if (match = line.match(/(\d+\.\d+\.\d+\.\d+)\s+(\S+)/))
         @ip, @hostname = match.captures
@@ -41,7 +43,7 @@ class Unifiap < Oxidized::Model
   end
 
   # We check here to see if we succeeded with /etc/hosts. If not, then we try again with ifconfig, and /tmp/system.cfg
-  cmd do
+  cmd 'echo' do
     unless @ip
       cmd 'ifconfig br0' do |cfg|
         @ip = Regexp.last_match(1) if cfg =~ /inet addr:\s*(\d+\.\d+\.\d+\.\d+)/i
@@ -74,8 +76,8 @@ class Unifiap < Oxidized::Model
     if cfg =~ /No such file/i
       if @ntpserver
         # Ok, now lets try getting the skew from the output of ntpclient
-        cmd "ntpclient -d -n -c 2 -i0 -h #{@ntpserver}" do |cfg|
-          @skew = ntpskew(cfg)
+        cmd "ntpclient -d -n -c 2 -i0 -h #{@ntpserver}" do |ntp_out|
+          @skew = ntpskew(ntp_out)
         end
         @sync = !@skew.nil? && @skew.to_f.abs < 1e6 ? "Synchronized" : "FAIL"
       end
@@ -87,7 +89,7 @@ class Unifiap < Oxidized::Model
   end
 
   # Now we can display it all as a banner
-  cmd do
+  cmd 'echo' do
     out = []
     out << "*************************"
     out << "Model:       #{@model}"

data/lib/oxidized/model/vrp.rb

@@ -27,7 +27,9 @@ class VRP < Oxidized::Model
   end
 
   cmd 'display version' do |cfg|
-    cfg = cfg.each_line.reject { |l| l.match /uptime|^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d(\.\d\d\d)? ?(\+\d\d:\d\d)?$/ }.join
+    cfg = cfg.each_line.reject do |l|
+      l.match /uptime|^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d(\.\d\d\d)? ?(\+\d\d:\d\d)?$/
+    end.join
     comment cfg
   end
 

data/lib/oxidized/model/xos.rb

@@ -33,7 +33,9 @@ class XOS < Oxidized::Model
 
   cmd 'show switch' do |cfg|
     cfg.gsub! /Next periodic save on.*/, ''
-    comment cfg.each_line.reject { |line| line.match(/Time:/) || line.match(/boot/i) || line.match(/Next periodic/) }.join
+    comment cfg.each_line.reject { |line|
+      line.match(/Time:/) || line.match(/boot/i) || line.match(/Next periodic/)
+    }.join
   end
 
   cmd 'show configuration' do |cfg|

data/lib/oxidized/model/zhoneolt.rb

@@ -36,7 +36,9 @@ class ZhoneOLT < Oxidized::Model
   end
 
   cmd 'ethrpshow' do |cfg|
-    cfg = cfg.each_line.select { |line| line.match /Vendor (Name|OUI|Part|Revision)|Serial Number|Manufacturing Date/ }.join
+    cfg = cfg.each_line.select do |line|
+      line.match /Vendor (Name|OUI|Part|Revision)|Serial Number|Manufacturing Date/
+    end.join
     comment cfg
   end
 

data/lib/oxidized/model/zynos.rb

@@ -1,9 +1,9 @@
 class ZyNOS < Oxidized::Model
   using Refinements
 
-  prompt /^([\w.@()-<]+[#>]\s?)$/
+  prompt /^([\w.@()\-<]+[#>]\s?)$/
   # if there is something you can not identify after prompt, uncomment next line and comment previous line
-  # prompt /^([\w.@()-<]+[#>]\s?).*$/
+  # prompt /^([\w.@()\-<]+[#>]\s?).*$/
 
   comment '! '
 
@@ -21,7 +21,7 @@ class ZyNOS < Oxidized::Model
   end
 
   # ignore copyright motd
-  expect /^(Copyright .*)\n^([\w.@()-<]+[#>]\s?)$/ do
+  expect /^(Copyright .*)\n^([\w.@()\-<]+[#>]\s?)$/ do
     send '\n'
     ""
   end