oxidized 0.29.1 → 0.37.0

data/lib/oxidized/model/os6.rb

@@ -0,0 +1,48 @@
+class OS6 < Oxidized::Model
+  using Refinements
+
+  # For switches running Dell EMC Networking OS6 #
+  #
+  # Tested with : Dell PowerSwitch N2048
+
+  comment  '! '
+
+  cmd :all do |cfg|
+    cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
+    cfg.each_line.to_a[2..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /(password )(\S+)/, '\1<secret hidden>'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show interfaces transceiver properties' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg.each_line.to_a[3..-1].join
+  end
+
+  cfg :telnet do
+    username /^Login:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    if vars :enable
+      post_login do
+        send "enable\n"
+        cmd vars(:enable)
+      end
+    end
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/outputs.rb

@@ -31,6 +31,11 @@ module Oxidized
         @outputs.map { |out| out.type }.uniq.compact
       end
 
+      def merge!(other)
+        other.all.each { |o| @outputs << o }
+        self
+      end
+
       private
 
       def initialize

data/lib/oxidized/model/panos.rb

@@ -18,6 +18,8 @@ class PanOS < Oxidized::Model
     cfg.gsub! /^threat-.*?: .*$/, ''
     cfg.gsub! /^wildfire-.*?: .*$/, ''
     cfg.gsub! /^wf-private.*?: .*$/, ''
+    cfg.gsub! /^device-dictionary-version.*?: .*$/, ''
+    cfg.gsub! /^device-dictionary-release-date.*?: .*$/, ''
     cfg.gsub! /^url-filtering.*?: .*$/, ''
     cfg.gsub! /^global-.*?: .*$/, ''
     comment cfg

data/lib/oxidized/model/perle.rb

@@ -0,0 +1,41 @@
+class Perle < Oxidized::Model
+  using Refinements
+
+  prompt /^[\w.-]+#/
+  comment '! '
+
+  cmd :all do |cfg|
+    cfg = cfg.cut_both
+    cfg.delete "\r"
+  end
+
+  cmd 'show version verbose' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show system hardware' do |cfg|
+    comment cfg + "\n"
+  end
+
+  cmd 'show interfaces transceiver' do |cfg|
+    cfg = cfg.keep_lines [
+      'SFP Information',
+      'Vendor Name',
+      'Vendor Serial Number'
+    ]
+    comment cfg + "\n"
+  end
+
+  cmd 'show running-config'
+
+  cmd :significant_changes do |cfg|
+    cfg.reject_lines [
+      /^tacacs-server key 7 \$0\$\S+==$/
+    ]
+  end
+
+  cfg :ssh do
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/pfsense.rb

@@ -15,6 +15,7 @@ class PfSense < Oxidized::Model
 
     cfg.gsub! /\s<revision>\s*<time>\d*<\/time>\s*.*\s*.*\s*<\/revision>/, ''
     cfg.gsub! /\s<last_rule_upd_time>\d*<\/last_rule_upd_time>/, ''
+    cfg.gsub! /\s<created>\s*<time>\d*<\/time>\s*.*CDATA\[Auto\].*\s*.*\s*<\/created>/, ''
     cfg
   end
 
@@ -25,6 +26,14 @@ class PfSense < Oxidized::Model
     xmlcomment "PFsense #{version}"
   end
 
+  metadata :bottom do
+    xmlcomment interpolate_string(
+      vars("metadata_bottom") ||
+      vars("metadata_top") ||
+      Oxidized::Model::METADATA_DEFAULT
+    )
+  end
+
   cfg :ssh do
     exec true
     pre_logout 'exit'

data/lib/oxidized/model/powerconnect.rb

@@ -5,17 +5,19 @@ class PowerConnect < Oxidized::Model
 
   comment '! '
 
-  expect /^\s*--More--\s+.*$/ do |data, re|
+  expect /\n\s*--More--\s+.*/ do |data, re| # Also grab the blank line above the --More--
     send ' '
     data.sub re, ''
   end
 
+  # Filter all command output
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-3].join
+    cfg.gsub! /\r+/, ''                     # Remove the CR characters echoed back from the commands
+    cfg.cut_tail                            # Drop the last line which is the next prompt
   end
 
   cmd :secret do |cfg|
-    cfg.gsub! /^(username \S+ password (?:encrypted )?)\S+(.*)/, '\1<hidden>\2'
+    cfg.gsub! /^((?:enable |username \S+ )?password (?:level\s\d{1,2} |encrypted ){,2})\S+(.*)/, '\1<hidden>\2'
     cfg.gsub! /^(tacacs-server key) \S+/, '\\1 <secret hidden>'
     cfg
   end
@@ -32,7 +34,7 @@ class PowerConnect < Oxidized::Model
   end
 
   cmd 'show running-config' do |cfg|
-    cfg.sub(/^(sflow \S+ destination owner \S+ timeout )\d+$/, '! \1<timeout>')
+    cfg.sub(/^(sflow \S+ destination owner \S+ timeout )\d+$/, '! \1<timeout>') # Remove changing timeout
   end
 
   cfg :telnet, :ssh do
@@ -50,15 +52,21 @@ class PowerConnect < Oxidized::Model
       end
     end
 
-    post_login "terminal datadump"
-    post_login "terminal length 0"
-    pre_logout "logout"
-    pre_logout "exit"
+    post_login do
+      cmd "terminal datadump"
+      cmd "terminal length 0"
+    end
+    pre_logout do
+      send "exit\r"
+      sleep(0.25)
+      send "logout\r"
+    end
   end
 
   def clean(cfg)
     out = []
-    skip_blocks = 0
+    len1 = len2 = 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) && (@stackable == true)
@@ -71,9 +79,22 @@ class PowerConnect < Oxidized::Model
         skip_blocks -= 1 if /\S/ !~ line
         next
       end
-      out << line.strip
+      line = line.strip
+      # If the temps were not removed by skipping blocks, then mask them out wih XXX
+      # The most recent set of dashes has the spacing we want to match
+      if (match = line.match(/^(---+ +)(---+ +)/))
+        one, two = match.captures
+        len1 = one.length
+        len2 = two.length
+      end
+      # This can only be a temperature, right? ;-)
+      if (match = line.match(/^(\d{1,2}) {3,}\d+ (.*)$/))
+        one, two = match.captures
+        line = one.to_s + (' ' * (len1 - one.length)) + "XXX" + (' ' * (len2 - 3)) + two.to_s
+      end
+      out << line
     end
-    out = out.reject { |line| line[/Up\sTime/] }
+    out = out.reject { |line| line[/Up\sTime/] } # Filter out Up Time
     out = comment out.join "\n"
     out << "\n"
   end

data/lib/oxidized/model/procurve.rb

@@ -5,7 +5,7 @@ class Procurve < Oxidized::Model
   # ssh switches prompt may start with \r, followed by the prompt itself, regex ([\w\s.-]+[#>] ), which ends the line
   # telnet switches may start with various vt100 control characters, regex (\e\[24;[0-9][hH]), followed by the prompt, followed
   # by at least 3 other vt100 characters
-  prompt /(^\r|\e\[24;[0-9][hH])?([\w\s.-]+(\((config|vlan-[0-9]{1,4}|y\/n)\)|\(o\)nce)?[#>:?\]] {1,2})($|(\e\[24;[0-9][0-9]?[hH]){3})/
+  prompt /(^\r|\e\[24;[0-9][hH])?([\w\s.-]+[#>] )($|(\e\[24;[0-9][0-9]?[hH]){3})/
 
   comment '! '
 
@@ -36,6 +36,8 @@ class Procurve < Oxidized::Model
     cfg.gsub! /\e\[\??\d+(;\d+)*[A-Za-z]/, ''
     # Additional filtering for power usage reporting which obviously changes over time
     cfg.gsub! /^(.*AC [0-9]{3}V\/?([0-9]{3}V)?) *([0-9]{1,3}) (.*)/, '\\1 <removed> \\4'
+    # Remove failed commands that are not supported on all models
+    cfg.gsub! /^Invalid input: [A-Za-z-]+\n/, ''
     cfg
   end
 
@@ -73,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/rgos.rb

@@ -0,0 +1,33 @@
+class RGOS < Oxidized::Model
+  using Refinements
+
+  comment '! '
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^(username .+ (password|secret) \d) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(enable (password|secret)( level \d+)?( \d)?) .+/, '\\1 <secret hidden>'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    cfg = cfg.each_line.reject { |line| line.match /^System start time/ }.join
+    cfg = cfg.each_line.reject { |line| line.match /^\s*System uptime/ }.join
+    comment "#{cfg.cut_both}\n"
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg = cfg.each_line.reject { |line| line.match /^Building configuration.../ }.join
+    cfg = cfg.each_line.reject { |line| line.match /^Current configuration : \d+ bytes/ }.join
+    cfg = cfg.each_line.reject { |line| line.match /^version [\d\w()]+/ }.join
+    # remove empty lines
+    cfg = cfg.each_line.reject { |line| line.match /^[\r\n\s\u0000#]+$/ }.join
+    cfg.cut_both
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'terminal length 0'
+    post_login 'terminal width 0'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/riverbed.rb

@@ -0,0 +1,104 @@
+class Riverbed < Oxidized::Model
+  using Refinements
+
+  # Define the prompt
+  prompt /^.* *[\w-]+ *[#>] *$/
+
+  # Define comment character
+  comment '! '
+
+  # Remove sensitive information
+  cmd :secret do |cfg|
+    cfg.gsub! /^( *tacacs-server (.+ )?key) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^( *username .+ (password|secret) \d) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^( *ntp server .+ key) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^( *ntp peer .+ key) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^( *snmp-server community).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^( *ip security shared secret).*/, '\\1 <secret hidden>'
+    cfg.gsub! /^( *service shared-secret secret client).*/, '\\1 <secret hidden>'
+    cfg.gsub! /^( *service shared-secret secret server).*/, '\\1 <secret hidden>'
+    cfg
+  end
+
+  # Get version information and output it as comments
+  cmd 'show version' do |cfg|
+    cfg = cfg.cut_both
+
+    output = ''
+    cfg.each_line do |line|
+      line.strip!
+      output << comment("Product name: #{Regexp.last_match(1)}\n") if line =~ /^Product name:\s+(.*)$/
+      output << comment("Product release: #{Regexp.last_match(1)}\n") if line =~ /^Product release:\s+(.*)$/
+      output << comment("Build ID: #{Regexp.last_match(1)}\n") if line =~ /^Build ID:\s+(.*)$/
+      output << comment("Build date: #{Regexp.last_match(1)}\n") if line =~ /^Build date:\s+(.*)$/
+      output << comment("Build arch: #{Regexp.last_match(1)}\n") if line =~ /^Build arch:\s+(.*)$/
+      output << comment("Built by: #{Regexp.last_match(1)}\n") if line =~ /^Built by:\s+(.*)$/
+      output << comment("Product model: #{Regexp.last_match(1)}\n") if line =~ /^Product model:\s+(.*)$/
+      output << comment("Number of CPUs: #{Regexp.last_match(1)}\n") if line =~ /^Number of CPUs:\s+(.*)$/
+    end
+    output + "\n"
+  end
+
+  # Get hardware information and output it as comments
+  cmd 'show hardware all' do |cfg|
+    cfg = cfg.cut_both
+
+    output = ''
+    cfg.each_line do |line|
+      line.strip!
+      output << comment("Hardware revision: #{Regexp.last_match(1)}\n") if line =~ /^Hardware revision:\s+(.*)$/
+      output << comment("Mainboard: #{Regexp.last_match(1)}\n") if line =~ /^Mainboard:\s+(.*)$/
+      if line =~ /^Slot (\d+):\s+\.*\s+(.*)$/
+        slot_number = Regexp.last_match(1)
+        slot_info = Regexp.last_match(2)
+        output << comment("Slot #{slot_number}: #{slot_info}\n")
+      end
+      output << comment("System led: #{Regexp.last_match(1)}\n") if line =~ /^System led:\s+(.*)$/
+    end
+    output + "\n"
+  end
+
+  # Get serial information and output it as comment
+  cmd 'show info' do |cfg|
+    cfg = cfg.cut_both
+
+    output = ''
+    cfg.each_line do |line|
+      line.strip!
+      output << comment("Serial: #{Regexp.last_match(1)}\n") if line =~ /^Serial:\s+(.*)$/
+    end
+    output + "\n"
+  end
+
+  # Get the running configuration
+  cmd 'show running-config' do |cfg|
+    cfg = cfg.cut_both
+
+    cfg = cfg.each_line.map do |line|
+      if line =~ /^(.*##.*?##)(.*)$/
+        comment_part = Regexp.last_match(1).strip
+        command_part = Regexp.last_match(2).strip
+        comment_line = comment(comment_part)
+        if command_part.empty?
+          comment_line + "\n"
+        else
+          comment_line + "\n" + command_part + "\n"
+        end
+      else
+        line
+      end
+    end.join
+
+    cfg
+  end
+
+  # SSH configuration
+  cfg :ssh do
+    post_login do
+      cmd 'enable'
+      cmd 'terminal length 0'
+      cmd 'terminal width 1024'
+    end
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/routeros.rb

@@ -11,17 +11,17 @@ 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 routerboard print without-paging' do |cfg|
-    cfg = cfg.each_line.grep(/(model|firmware-type|current-firmware|serial-number):/).join
+  cmd '/system resource print' do |cfg|
+    cfg = cfg.each_line.grep(/(version|factory-software|total-memory|cpu|cpu-count|total-hdd-space|architecture-name|board-name|platform):/).join
     comment cfg
   end
 
-  cmd '/system package update print without-paging' do |cfg|
-    version_line = cfg.each_line.grep(/installed-version: /)[0]
-    @ros_version = /: ([0-9])/.match(version_line)[1].to_i
+  cmd '/system package update print' do |cfg|
+    version_line = cfg.each_line.grep(/installed-version:\s|current-version:\s/)[0]
+    @ros_version = /([0-9])/.match(version_line)[0].to_i
     comment version_line
   end
 
@@ -29,8 +29,12 @@ class RouterOS < Oxidized::Model
     comment cfg
   end
 
+  cmd :significant_changes do |cfg|
+    cfg.gsub(/^(#\s+installed-version: [^\n]+\n).*?^(?=# software id)/m, '\1')
+  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)
@@ -40,12 +44,15 @@ class RouterOS < Oxidized::Model
               end
     cmd run_cmd do |cfg|
       cfg.gsub! /\\\r?\n\s+/, '' # strip new line
-      cfg.gsub! /# inactive time\r\n/, '' # Remove time based system comment
+      cfg.gsub! "# inactive time\r\n", '' # Remove time based system comment
       cfg.gsub! /# received packet from \S+ bad format\r\n/, '' # Remove intermittent VRRP/CARP collision comment
-      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! "# 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 = cfg.split("\n").reject { |line| line[/^#\s\w{3}\/\d{2}\/\d{4}.*$/] }
+      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)
       cfg.join("\n") + "\n"
     end
   end

data/lib/oxidized/model/saos.rb

@@ -4,12 +4,29 @@ class SAOS < Oxidized::Model
   # Ciena SAOS switch
   # used for 6.x devices
 
-  comment  '! '
+  comment '! '
+  prompt /^[\w-]+\*?>\s?/
 
   cmd :all do |cfg|
+    cfg.gsub! /(Waiting for )(accounting|authorization).*\n/, '' # Remove TACACS errors
     cfg.cut_both
   end
 
+  cmd 'chassis show device-id power' do |cfg|
+    comment cfg
+  end
+
+  cmd 'software show' do |cfg|
+    cfg.gsub! /^\| Bank status.*/, '| Bank status         : <removed>                                              |'
+    comment cfg
+  end
+
+  cmd 'port xcvr show' do |cfg|
+    cfg.gsub! /^SHELL PARSER FAILURE.*/, '' # Ignore command failure
+    cfg.gsub! /(\s\|.{10}\|)(Ena\s\s|\s\sDis|UCTF\s)(.*)/, '\1     \3' # Remove transient operational state
+    comment cfg
+  end
+
   cmd 'configuration show' do |cfg|
     cfg.gsub! /^! Created: [^\n]*\n/, ''
     cfg.gsub! /^! On terminal: [^\n]*\n/, ''

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/siklu.rb

@@ -3,7 +3,7 @@ class Siklu < Oxidized::Model
 
   # Siklu EtherHaul #
 
-  prompt /^[\^M\s]{0,}[\w\-\s\.\"]+>$/
+  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/siklumhtg.rb

@@ -0,0 +1,22 @@
+class SikluMHTG < Oxidized::Model
+  using Refinements
+
+  # Siklu MultiHaul TG#
+  # Requires source to define the model as SikluMHTG #
+
+  prompt /^\r?MH-[TN]\d{3}@\w{2,8}>$/
+
+  expect /--More--/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
+  cmd 'show startup' do |cfg|
+    cfg.gsub! /[\b]|\e\[A|\e\[2K/, ''
+    cfg.cut_both
+  end
+
+  cfg :ssh do
+    pre_logout 'quit'
+  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/slxos.rb

@@ -14,9 +14,9 @@ class SLXOS < Oxidized::Model
   cmd 'show chassis' do |cfg|
     cfg.encode!("UTF-8", invalid: :replace, undef: :replace) # sometimes ironware returns broken encoding
     cfg.gsub! /.*Power Usage.*/, '' # remove unwanted lines power usage
-    cfg.gsub! /^Update\:.*$/, '' # remove unwanted current date
+    cfg.gsub! /^Update:.*$/, '' # remove unwanted current date
     cfg.gsub! /Time A(live|wake).*/, '' # remove unwanted lines time alive/awake
-    cfg.gsub! /([\[]*)1([\]]*)<->([\[]*)2([\]]*)(<->([\[]*)3([\]]*))*/, ''
+    cfg.gsub! /(\[*)1(\]*)<->(\[*)2(\]*)(<->(\[*)3(\]*))*/, ''
 
     comment cfg
   end
@@ -31,7 +31,7 @@ class SLXOS < Oxidized::Model
 
   cmd 'show slots' do |cfg|
     cfg.gsub! /^-*^$/, '' # some slx devices are fixed config
-    cfg.gsub! /syntax error: element does not exist/, '' # same as above
+    cfg.gsub! "syntax error: element does not exist", '' # same as above
 
     comment cfg
   end