oxidized 0.20.0 → 0.28.0

data/lib/oxidized/model/ios.rb

@@ -1,40 +1,47 @@
 class IOS < Oxidized::Model
-
   prompt /^([\w.@()-]+[#>]\s?)$/
   comment  '! '
 
   # example how to handle pager
-  #expect /^\s--More--\s+.*$/ do |data, re|
+  # expect /^\s--More--\s+.*$/ do |data, re|
   #  send ' '
   #  data.sub re, ''
-  #end
+  # end
 
   # non-preferred way to handle additional PW prompt
-  #expect /^[\w.]+>$/ do |data|
+  # expect /^[\w.]+>$/ do |data|
   #  send "enable\n"
   #  send vars(:enable) + "\n"
   #  data
-  #end
+  # end
 
   cmd :all do |cfg|
-    #cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
-    #cfg.gsub! /\cH+/, ''              # example how to handle pager
+    # cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
+    # cfg.gsub! /\cH+/, ''              # example how to handle pager
     # get rid of errors for commands that don't work on some devices
     cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
-    cfg.gsub! /^(username \S+ privilege \d+) (\S+).*/, '\\1 <secret hidden>'
-    cfg.gsub! /^(username \S+ password \d) (\S+)/, '\\1 <secret hidden>'
-    cfg.gsub! /^(username \S+ secret \d) (\S+)/, '\\1 <secret hidden>'
-    cfg.gsub! /^(enable (password|secret) \d) (\S+)/, '\\1 <secret hidden>'
+    cfg.gsub! /^(snmp-server host \S+( vrf \S+)?( informs?)?( version (1|2c|3 (noauth|auth|priv)))?)\s+\S+((\s+\S*)*)\s*/, '\\1 <secret hidden> \\7'
+    cfg.gsub! /^(username .+ (password|secret) \d) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(enable (password|secret)( level \d+)? \d) .+/, '\\1 <secret hidden>'
     cfg.gsub! /^(\s+(?:password|secret)) (?:\d )?\S+/, '\\1 <secret hidden>'
     cfg.gsub! /^(.*wpa-psk ascii \d) (\S+)/, '\\1 <secret hidden>'
     cfg.gsub! /^(.*key 7) (\d.+)/, '\\1 <secret hidden>'
-    cfg.gsub! /^(tacacs-server key \d) (\S+)/, '\\1 <secret hidden>'
+    cfg.gsub! /^(tacacs-server (.+ )?key) .+/, '\\1 <secret hidden>'
     cfg.gsub! /^(crypto isakmp key) (\S+) (.*)/, '\\1 <secret hidden> \\3'
+    cfg.gsub! /^(\s+ip ospf message-digest-key \d+ md5) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(\s+ip ospf authentication-key) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(\s+neighbor \S+ password) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(\s+vrrp \d+ authentication text) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(\s+standby \d+ authentication) .{1,8}$/, '\\1 <secret hidden>'
+    cfg.gsub! /^(\s+standby \d+ authentication md5 key-string) .+?( timeout \d+)?$/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(\s+key-string) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^((tacacs|radius) server [^\n]+\n(\s+[^\n]+\n)*\s+key) [^\n]+$/m, '\1 <secret hidden>'
+    cfg.gsub! /^(\s+ppp (chap|pap) password \d) .+/, '\\1 <secret hidden>'
     cfg
   end
 
@@ -42,64 +49,46 @@ class IOS < Oxidized::Model
     comments = []
     comments << cfg.lines.first
     lines = cfg.lines
-    lines.each_with_index do |line,i|
-        slave = ''
-        slaveslot = ''
+    lines.each_with_index do |line, i|
+      slave = ''
+      slaveslot = ''
 
-        if line.match /^Slave in slot (\d+) is running/
-            slave = " Slave:";
-            slaveslot = ", slot #{$1}";
-        end
+      if line =~ /^Slave in slot (\d+) is running/
+        slave = " Slave:"
+        slaveslot = ", slot #{Regexp.last_match(1)}"
+      end
 
-        if line.match /^Compiled (.*)$/
-            comments << "Image:#{slave} Compiled: #{$1}"
-        end
+      comments << "Image:#{slave} Compiled: #{Regexp.last_match(1)}" if line =~ /^Compiled (.*)$/
 
-        if line.match /^(?:Cisco )?IOS .* Software,? \(([A-Za-z0-9_-]*)\), .*Version\s+(.*)$/
-            comments << "Image:#{slave} Software: #{$1}, #{$2}"
-        end
+      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.match /^ROM: (IOS \S+ )?(System )?Bootstrap.*(Version.*)$/
-            comments << "ROM Bootstrap: #{$3}"
-        end
+      comments << "ROM Bootstrap: #{Regexp.last_match(3)}" if line =~ /^ROM: (IOS \S+ )?(System )?Bootstrap.*(Version.*)$/
 
-        if line.match /^BOOTFLASH: .*(Version.*)$/
-            comments << "BOOTFLASH: #{$1}"
-        end
+      comments << "BOOTFLASH: #{Regexp.last_match(1)}" if line =~ /^BOOTFLASH: .*(Version.*)$/
 
-        if line.match /^(\d+[kK]) bytes of (non-volatile|NVRAM)/
-            comments << "Memory: nvram #{$1}"
-        end
+      comments << "Memory: nvram #{Regexp.last_match(1)}" if line =~ /^(\d+[kK]) bytes of (non-volatile|NVRAM)/
 
-        if line.match /^(\d+[kK]) bytes of (flash memory|flash internal|processor board System flash|ATA CompactFlash)/i
-            comments << "Memory: flash #{$1}"
-        end
+      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.match (/^(\d+[kK]) bytes of (Flash|ATA)?.*PCMCIA .*(slot|disk) ?(\d)/i)
-            comments << "Memory: pcmcia #{$2} #{$3}#{$4} #{$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.match /(\S+(?:\sseries)?)\s+(?:\((\S+)\)\s+processor|\(revision[^)]+\)).*\s+with (\S+k) bytes/i
-            sproc = $1
-            cpu = $2
-            mem = $3
-            cpuxtra = ''
-            comments << "Chassis type:#{slave} #{sproc}";
-            comments << "Memory:#{slave} main #{mem}";
-            # check the next two lines for more CPU info
-            if cfg.lines[i+1].match /processor board id (\S+)/i
-                comments << "Processor ID: #{$1}";
-            end
-            if cfg.lines[i+2].match /(cpu at |processor: |#{cpu} processor,)/i
-                # change implementation to impl and prepend comma
-                cpuxtra = cfg.lines[i+2].gsub(/implementation/,'impl').gsub(/^/,', ').chomp;
-            end
-            comments << "CPU:#{slave} #{cpu}#{cpuxtra}#{slaveslot}";
+      if line =~ /(\S+(?:\sseries)?)\s+(?:\((\S+)\)\s+processor|\(revision[^)]+\)).*\s+with (\S+k) bytes/i
+        sproc = Regexp.last_match(1)
+        cpu = Regexp.last_match(2)
+        mem = Regexp.last_match(3)
+        cpuxtra = ''
+        comments << "Chassis type:#{slave} #{sproc}"
+        comments << "Memory:#{slave} main #{mem}"
+        # check the next two lines for more CPU info
+        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
         end
+        comments << "CPU:#{slave} #{cpu}#{cpuxtra}#{slaveslot}"
+      end
 
-        if line.match /^System image file is "([^\"]*)"$/
-            comments << "Image: #{$1}"
-        end
+      comments << "Image: #{Regexp.last_match(1)}" if line =~ /^System image file is "([^"]*)"$/
     end
     comments << "\n"
     comment comments.join "\n"
@@ -107,7 +96,8 @@ class IOS < Oxidized::Model
 
   cmd 'show vtp status' do |cfg|
     cfg.gsub! /^$\n/, ''
-    cfg.gsub! /^/, 'VTP: ' if (!cfg.empty?)
+    cfg.gsub! /Configuration last modified by.*\n/, ''
+    cfg.gsub! /^/, 'VTP: ' unless cfg.empty?
     comment "#{cfg}\n"
   end
 
@@ -119,22 +109,26 @@ class IOS < Oxidized::Model
     cfg = cfg.each_line.to_a[3..-1]
     cfg = cfg.reject { |line| line.match /^ntp clock-period / }.join
     cfg.gsub! /^Current configuration : [^\n]*\n/, ''
-    cfg.gsub! /^\ tunnel\ mpls\ traffic-eng\ bandwidth[^\n]*\n*(
-                  (?:\ [^\n]*\n*)*
-                  tunnel\ mpls\ traffic-eng\ auto-bw)/mx, '\1'
+    cfg.gsub! /^! (Last|No) configuration change (at|since).*\n/, ''
+    cfg.gsub! /^! NVRAM config last updated.*\n/, ''
+    cfg.gsub! /^ tunnel mpls traffic-eng bandwidth[^\n]*\n*(
+                  (?: [^\n]*\n*)*
+                  tunnel mpls traffic-eng auto-bw)/mx, '\1'
     cfg
   end
 
   cfg :telnet do
-    username /^Username:/
-    password /^Password:/
+    username /^Username:/i
+    password /^Password:/i
   end
 
   cfg :telnet, :ssh do
     # preferred way to handle additional passwords
-    if vars :enable
-      post_login do
-        send "enable\n"
+    post_login do
+      if vars(:enable) == true
+        cmd "enable"
+      elsif vars(:enable)
+        cmd "enable", /^[pP]assword:/
         cmd vars(:enable)
       end
     end
@@ -142,5 +136,4 @@ class IOS < Oxidized::Model
     post_login 'terminal width 0'
     pre_logout 'exit'
   end
-
 end

data/lib/oxidized/model/iosxe.rb

@@ -0,0 +1,5 @@
+# IOS parser should work here
+
+require_relative 'ios.rb'
+
+IOSXE = IOS

data/lib/oxidized/model/iosxr.rb

@@ -1,5 +1,4 @@
 class IOSXR < Oxidized::Model
-
   # IOS XR model #
 
   prompt /^(\r?[\w.@:\/-]+[#>]\s?)$/
@@ -9,7 +8,7 @@ class IOSXR < Oxidized::Model
     cfg.each_line.to_a[2..-2].join
   end
 
-  cmd :secret do |cfg| 
+  cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
     cfg.gsub! /secret (\d+) (\S+).*/, '<secret hidden>'
     cfg
@@ -36,6 +35,7 @@ class IOSXR < Oxidized::Model
   cfg :telnet, :ssh do
     post_login 'terminal length 0'
     post_login 'terminal width 0'
+    post_login 'terminal exec prompt no-timestamp'
     if vars :enable
       post_login do
         send "enable\n"
@@ -44,5 +44,4 @@ class IOSXR < Oxidized::Model
     end
     pre_logout 'exit'
   end
-
 end

data/lib/oxidized/model/ipos.rb

@@ -1,21 +1,20 @@
 class IPOS < Oxidized::Model
-
   # Ericsson SSR (IPOS)
   # Redback SE (SEOS)
 
-  prompt /^([\[\]\w.@-]+[#>]\s?)$/
+  prompt /^([\[\]\w.@-]+[#:>]\s?)$/
   comment '! '
 
   cmd 'show chassis' do |cfg|
-    comment cfg.each_line.to_a[0..-2].join
+    comment cfg.cut_tail
   end
 
   cmd 'show hardware' do |cfg|
-    comment cfg.each_line.to_a[0..-2].join
+    comment cfg.cut_tail
   end
 
   cmd 'show release' do |cfg|
-    comment cfg.each_line.to_a[0..-2].join
+    comment cfg.cut_tail
   end
 
   cmd 'show configuration' do |cfg|
@@ -52,10 +51,15 @@ class IPOS < Oxidized::Model
 
   cfg :telnet, :ssh do
     post_login 'terminal length 0'
+    if vars :enable
+      post_login do
+        cmd "enable"
+        cmd vars(:enable)
+      end
+    end
     pre_logout do
       send "exit\n"
       send "n\n"
     end
   end
-
 end

data/lib/oxidized/model/ironware.rb

@@ -1,19 +1,17 @@
 class IronWare < Oxidized::Model
-
-  prompt /^.*(telnet|ssh)\@.+[>#]\s?$/i
+  prompt /^.*(telnet|ssh)@.+[>#]\s?$/i
   comment  '! '
 
-  #to handle pager without enable
-  #expect /^((.*)--More--(.*))$/ do |data, re|
+  # to handle pager without enable
+  # expect /^((.*)--More--(.*))$/ do |data, re|
   #  send ' '
   #  data.sub re, ''
-  #end
-
+  # end
 
-  #to remove backspace (if handle pager without enable)
-  #expect /^((.*)[\b](.*))$/ do |data, re|
+  # to remove backspace (if handle pager without enable)
+  # expect /^((.*)[\b](.*))$/ do |data, re|
   #  data.sub re, ''
-  #end
+  # end
 
   cmd :all do |cfg|
     # sometimes ironware inserts arbitrary whitespace after commands are
@@ -22,18 +20,20 @@ class IronWare < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
-    cfg.gsub! /(^((.*)[Ss]ystem uptime(.*))$)/, '' #remove unwanted line system uptime
+    cfg.gsub! /(^((.*)[Ss]ystem uptime(.*))$)/, '' # remove unwanted line system uptime
     cfg.gsub! /(^((.*)[Tt]he system started at(.*))$)/, ''
-    cfg.gsub! /[Uu]p\s?[Tt]ime is .*/,''
+    cfg.gsub! /[Uu]p\s?[Tt]ime is .*/, ''
 
     comment cfg
   end
 
   cmd 'show chassis' do |cfg|
-    cfg.encode!("UTF-8", :invalid => :replace, :undef => :replace) #sometimes ironware returns broken encoding
-    cfg.gsub! /(^((.*)Current temp(.*))$)/, '' #remove unwanted lines current temperature
-    cfg.gsub! /Speed = [A-Z-]{2,6} \(\d{2,3}\%\)/, '' #remove unwanted lines Speed Fans
-    cfg.gsub! /current speed is [A-Z]{2,6} \(\d{2,3}\%\)/, ''
+    cfg.encode!("UTF-8", invalid: :replace, undef: :replace) # sometimes ironware returns broken encoding
+    cfg.gsub! /(^((.*)Current temp(.*))$)/, '' # remove unwanted lines current temperature
+    cfg.gsub! /Speed = [A-Z-]{2,6} \(\d{2,3}%\)/, '' # remove unwanted lines Speed Fans
+    cfg.gsub! /current speed is [A-Z]{2,6} \(\d{2,3}%\)/, ''
+    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'
     if cfg.include? "TEMPERATURE"
@@ -50,6 +50,8 @@ class IronWare < Oxidized::Model
   end
 
   cmd 'show flash' do |cfg|
+    cfg.gsub! /(\d+) bytes/, '' # Fix for ADX flash size
+    cfg.gsub! /(^((.*)Code Flash Free Space(.*))$)/, '' # Brocade
     comment cfg
   end
 
@@ -67,14 +69,14 @@ class IronWare < Oxidized::Model
     # match expected prompts on both older and newer
     # versions of IronWare
     username /^(Please Enter Login Name|Username):/
-    password /^(Please Enter Password |Password):/
+    password /^(Please Enter Password ?|Password):/
   end
 
-  #handle pager with enable
+  # handle pager with enable
   cfg :telnet, :ssh do
     if vars :enable
       post_login do
-        send "enable\n"
+        send "enable\r\n"
         cmd vars(:enable)
       end
     end
@@ -83,5 +85,4 @@ class IronWare < Oxidized::Model
     post_login 'terminal length 0'
     pre_logout "logout\nexit\nexit\n"
   end
-
 end

data/lib/oxidized/model/isam.rb

@@ -1,14 +1,14 @@
 class ISAM < Oxidized::Model
-  #Alcatel ISAM 7302/7330 FTTN
-  
+  # Alcatel ISAM 7302/7330 FTTN
+
   prompt /^([\w.:@-]+>#\s)$/
   comment '# '
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
-  cfg :telnet do 
+  cfg :telnet do
     username /^login:\s*/
     password /^password:\s*/
   end
@@ -19,7 +19,7 @@ class ISAM < Oxidized::Model
     post_login 'environment inhibit-alarms print no-more'
     pre_logout 'logout'
   end
-  
+
   cmd 'show software-mngt oswp detail' do |cfg|
     comment cfg
   end
@@ -31,5 +31,4 @@ class ISAM < Oxidized::Model
   cmd 'info configure flat' do |cfg|
     cfg
   end
-
 end

data/lib/oxidized/model/junos.rb

@@ -1,27 +1,24 @@
 class JunOS < Oxidized::Model
-
-  comment  '# '
+  comment '# '
 
   def telnet
     @input.class.to_s.match(/Telnet/)
   end
 
   cmd :all do |cfg|
-    cfg = cfg.lines.to_a[1..-2].join if screenscrape
-    cfg.gsub!(/  scale-subscriber (\s+)(\d+)/,'  scale-subscriber                <count>')
+    cfg = cfg.cut_both if screenscrape
+    cfg.gsub!(/  scale-subscriber (\s+)(\d+)/, '  scale-subscriber                <count>')
     cfg.lines.map { |line| line.rstrip }.join("\n") + "\n"
   end
 
   cmd :secret do |cfg|
-    cfg.gsub!(/encrypted-password (\S+).*/, '<secret removed>')
     cfg.gsub!(/community (\S+) {/, 'community <hidden> {')
+    cfg.gsub!(/ "\$\d\$\S+; ## SECRET-DATA/, ' <secret removed>;')
     cfg
   end
 
-  cmd 'show configuration | display omit'
-
   cmd 'show version' do |cfg|
-    @model = $1 if cfg.match(/^Model: (\S+)/)
+    @model = Regexp.last_match(1) if cfg =~ /^Model: (\S+)/
     comment cfg
   end
 
@@ -29,7 +26,7 @@ class JunOS < Oxidized::Model
     out = ''
     case @model
     when 'mx960'
-      out << cmd('show chassis fabric reachability')  { |cfg| comment cfg }
+      out << cmd('show chassis fabric reachability') { |cfg| comment cfg }
     when /^(ex22|ex33|ex4|ex8|qfx)/
       out << cmd('show virtual-chassis') { |cfg| comment cfg }
     end
@@ -40,13 +37,15 @@ class JunOS < Oxidized::Model
   cmd('show system license') { |cfg| comment cfg }
   cmd('show system license keys') { |cfg| comment cfg }
 
+  cmd 'show configuration | display omit'
+
   cfg :telnet do
     username(/^login:/)
     password(/^Password:/)
   end
 
   cfg :ssh do
-    exec true  # don't run shell, run each command in exec channel
+    exec true # don't run shell, run each command in exec channel
   end
 
   cfg :telnet, :ssh do
@@ -54,5 +53,4 @@ class JunOS < Oxidized::Model
     post_login 'set cli screen-width 0'
     pre_logout 'exit'
   end
-
 end

data/lib/oxidized/model/linuxgeneric.rb

@@ -0,0 +1,74 @@
+class LinuxGeneric < Oxidized::Model
+  prompt /^(\w.*|\W.*)(:|#) /
+  comment '# '
+
+  # add a comment in the final conf
+  def add_comment(comment)
+    "\n###### #{comment} ######\n"
+  end
+
+  cmd :all do |cfg|
+    cfg.gsub! /^(default (\S+).* (expires) ).*/, '\\1 <redacted>'
+    cfg.cut_both
+  end
+
+  # show the persistent configuration
+  pre do
+    cfg = add_comment 'THE HOSTNAME'
+    cfg += cmd 'cat /etc/hostname'
+
+    cfg += add_comment 'THE HOSTS'
+    cfg += cmd 'cat /etc/hosts'
+
+    cfg += add_comment 'THE INTERFACES'
+    cfg += cmd 'ip link'
+
+    cfg += add_comment 'RESOLV.CONF'
+    cfg += cmd 'cat /etc/resolv.conf'
+
+    cfg += add_comment 'IP Routes'
+    cfg += cmd 'ip route'
+
+    cfg += add_comment 'IPv6 Routes'
+    cfg += cmd 'ip -6 route'
+
+    cfg += add_comment 'MOTD'
+    cfg += cmd 'cat /etc/motd'
+
+    cfg += add_comment 'PASSWD'
+    cfg += cmd 'cat /etc/passwd'
+
+    cfg += add_comment 'GROUP'
+    cfg += cmd 'cat /etc/group'
+
+    cfg += add_comment 'nsswitch.conf'
+    cfg += cmd 'cat /etc/nsswitch.conf'
+
+    cfg += add_comment 'VERSION'
+    cfg += cmd 'cat /etc/issue'
+
+    cfg
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login do
+      if vars(:enable) == true
+        cmd "sudo su -", /^\[sudo\] password/
+        cmd @node.auth[:password]
+      elsif vars(:enable)
+        cmd "su -", /^Password:/
+        cmd vars(:enable)
+      end
+    end
+
+    pre_logout do
+      cmd "exit" if vars(:enable)
+    end
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/masteros.rb

@@ -1,8 +1,7 @@
 class MasterOS < Oxidized::Model
-
   # MRV MasterOS model #
 
-comment '!'
+  comment '!'
 
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
@@ -11,13 +10,12 @@ comment '!'
   end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
     cfg.gsub /^(! Configuration ).*/, '!'
   end
 
   cmd 'show inventory' do |cfg|
-    cfg = cfg.each_line.to_a[0..-2].join
-    comment cfg
+    comment cfg.cut_tail
   end
 
   cmd 'show plugins' do |cfg|
@@ -43,5 +41,4 @@ comment '!'
     end
     pre_logout 'exit'
   end
-
 end

data/lib/oxidized/model/mlnxos.rb

@@ -1,23 +1,22 @@
 class MLNXOS < Oxidized::Model
-
   prompt /([\w.@()-\[:\s\]]+[#>]\s)$/
-  comment  '## '
-  
+  comment '## '
+
   # Pager Handling
-  expect /.+lines\s\d+\-\d+([\s]|\/\d+\s\(END\)\s).+$/ do |data, re|
+  expect /.+lines\s\d+-\d+([\s]|\/\d+\s\(END\)\s).+$/ do |data, re|
     send ' '
     data.sub re, ''
   end
 
   cmd :all do |cfg|
     cfg.gsub! /\[\?1h=\r/, '' # Pager Handling
-    cfg.gsub! /\r\[K/,'' # Pager Handling
+    cfg.gsub! /\r\[K/, '' # Pager Handling
     cfg.gsub! /\s/, '' # Linebreak Handling
-    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
-    cfg.gsub! /.+Generated\ at\s\d+.+/, '' # Omit constantly changing generation time info
-    cfg = cfg.lines.to_a[2..-3].join
+    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
+    cfg.gsub! /.+Generated at\s\d+.+/, '' # Omit constantly changing generation time info
+    cfg.lines.to_a[2..-3].join
   end
 
   cmd :secret do |cfg|