oxidized 0.28.0 → 0.29.0

data/lib/oxidized/model/aoscx.rb

@@ -0,0 +1,96 @@
+class Aoscx < Oxidized::Model
+  # previous command is repeated followed by "\eE", which sometimes ends up on last line
+  # ssh switches prompt may start with \r, followed by the prompt itself, regex ([\w\s.-]+[#>] ), which ends the line
+  # telnet switchs may start with various vt100 control characters, regex (\e\[24;[0-9][hH]), follwed by the prompt, followed
+  # by at least 3 other vt100 characters
+  prompt /(^\r|\e\[24;[0-9][hH])?([\w\s.-]+[#>] )($|(\e\[24;[0-9][0-9]?[hH]){3})/
+
+  comment '! '
+
+  # replace next line control sequence with a new line
+  expect /(\e\[1M\e\[\??\d+(;\d+)*[A-Za-z]\e\[1L)|(\eE)/ do |data, re|
+    data.gsub re, "\n"
+  end
+
+  # replace all used vt100 control sequences
+  expect /\e\[\??\d+(;\d+)*[A-Za-z]/ do |data, re|
+    data.gsub re, ''
+  end
+
+  expect /Press any key to continue(\e\[\??\d+(;\d+)*[A-Za-z])*$/ do
+    send ' '
+    ""
+  end
+
+  expect /Enter switch number/ do
+    send "\n"
+    ""
+  end
+
+  cmd :all do |cfg|
+    cfg = cfg.cut_both
+    cfg = cfg.gsub /^\r/, ''
+    # Additional filtering for elder switches sending vt100 control chars via telnet
+    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'
+    cfg
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community) \S+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(snmp-server host \S+) \S+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(radius-server host \S+ key) \S+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(radius-server key).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^(tacacs-server host \S+ key) \S+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(tacacs-server key).*/, '\\1 <secret hidden>'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show environment' do |cfg|
+    cfg.gsub! /^(LC.*\s+)\d+\s+$/, '\\1<hidden>'
+    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'
+    comment cfg
+  end
+
+  cmd 'show module' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show interface transceiver' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show system | exclude "Up Time" | exclude "CPU" | exclude "Memory"' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config'
+
+  cfg :telnet do
+    username /Username:/
+    password /Password:/
+  end
+
+  cfg :telnet, :ssh do
+    # preferred way to handle additional passwords
+    if vars :enable
+      post_login do
+        send "enable\n"
+        cmd vars(:enable)
+      end
+    end
+    post_login 'no page'
+    pre_logout "exit"
+  end
+
+  cfg :ssh do
+    pty_options(chars_wide: 1000)
+  end
+end

data/lib/oxidized/model/aosw.rb

@@ -39,7 +39,7 @@ class AOSW < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
-    cfg = cfg.each_line.reject { |line| line.match /(Switch|AP) uptime/i }
+    cfg = cfg.each_line.reject { |line| line.match(/(Switch|AP) uptime/i) || line.match(/Reboot Time and Cause/i) }
     rstrip_cfg comment cfg.join
   end
 

data/lib/oxidized/model/asa.rb

@@ -34,6 +34,8 @@ class ASA < Oxidized::Model
     # avoid commits due to uptime / ixo-router01 up 2 mins 28 secs / ixo-router01 up 1 days 2 hours
     cfg = cfg.each_line.reject { |line| line.match /(\s+up\s+\d+\s+)|(.*days.*)/ }
     cfg = cfg.join
+    cfg.gsub! /^Configuration has not been modified since last system restart.*\n/, ''
+    cfg.gsub! /^Configuration last modified by.*\n/, ''
     comment cfg
   end
 

data/lib/oxidized/model/awplus.rb

@@ -51,7 +51,7 @@ class AWPlus < Oxidized::Model
                 line.match(/Current software\s*:.*/) ||
                 line.match(/Software version\s*:.*/) ||
                 line.match(/Build date\s*:.*/)
-            } .join
+            }.join
   end
 
   # Actually get the devices running config#

data/lib/oxidized/model/bdcom.rb

@@ -0,0 +1,49 @@
+class BDCOM < Oxidized::Model
+  comment '! '
+
+  cmd :secret do |cfg|
+    cfg.gsub!(/password \d+ (\S+).*/, '<secret removed>')
+    cfg.gsub!(/community (\S+)/, 'community <hidden>')
+    cfg
+  end
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[0..-2].join
+  end
+
+  cmd 'show running-config'
+
+  cmd 'show version' do |cfg|
+    cfg.gsub! /(\s*uptime is\s*)[0-9:]+/, '\1 <removed>'
+    cfg.gsub! /(\s*current time:\s*)[0-9-]+\s+[0-9:]+/, '\1 <removed>'
+    cfg.gsub! /(\s*at)\s+[0-9-]+\s+[0-9:]+(,\s*uptime\s+[0-9:]+)?/, '\1 <removed>'
+    comment cfg
+  end
+
+  cmd 'show power-status' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show fan-status' do |cfg|
+    comment cfg
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  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 'exit'
+  end
+end

data/lib/oxidized/model/cambiumepmp.rb

@@ -0,0 +1,17 @@
+class CambiumePMP < Oxidized::Model
+  # Cambium ePMP Radios
+
+  prompt /.*>/
+
+  cmd :all do |cfg|
+    cfg.cut_both
+  end
+
+  pre do
+    cmd 'config show json'
+  end
+
+  cfg :ssh do
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/casa.rb

@@ -10,6 +10,7 @@ class Casa < Oxidized::Model
     cfg.gsub! /^(console-password encrypted) \S+/, '\\1 <secret hidden>'
     cfg.gsub! /^(password encrypted) \S+/, '\\1 <secret hidden>'
     cfg.gsub! /^(tacacs-server key) \S+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(  ip rip authentication secret) \S+/, '\\1 <secret hidden>'
     cfg
   end
 
@@ -18,7 +19,9 @@ class Casa < Oxidized::Model
   end
 
   cmd 'show system' do |cfg|
-    comment cfg.each_line.reject { |line| line.match /^\s+System (Time|Uptime): / }.join
+    cfg.gsub! /Uptime:.*/, 'Uptime: <removed>'
+    cfg.gsub! /Time:.*/, 'Time: <removed>'
+    comment cfg
   end
 
   cmd 'show version' do |cfg|

data/lib/oxidized/model/ciscoce.rb

@@ -0,0 +1,12 @@
+# Supporting Cisco Catalyst Express Switches and IOS using the basic web interface
+class CiscoCE < Oxidized::Model
+  cmd "/level/15/exec/-/show/startup-config" do |cfg|
+    output = cfg.gsub(/\A.+<DL>(.+)<\/DL>.+\z/m, '\1') # Strip configuration file from within HTML response.
+    output
+  end
+
+  cfg :http do
+    @username = @node.auth[:username]
+    @password = @node.auth[:password]
+  end
+end

data/lib/oxidized/model/ciscosmb.rb

@@ -26,6 +26,8 @@ class CiscoSMB < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
+    cfg.gsub! /.*Uptime for this control.*/, ''
+    cfg.gsub! /.*System restarted.*/, ''
     cfg.gsub! /uptime is\ .+/, '<uptime removed>'
     comment cfg
   end

data/lib/oxidized/model/comware.rb

@@ -31,6 +31,15 @@ class Comware < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
+    # handle enable passwords
+    post_login do
+      if vars(:enable) == true
+        cmd "super"
+      elsif vars(:enable)
+        cmd "super", /^ [pP]assword:/
+        cmd vars(:enable)
+      end
+    end
     # enable command-line mode on SMB comware switches (HP V1910, V1920)
     # autodetection is hard, because the 'summary' command is paged, and
     # the pager cannot be disabled before _cmdline-mode on.
@@ -41,10 +50,16 @@ class Comware < Oxidized::Model
         cmd 'y', /(#{@node.prompt}|input password)/
         cmd vars(:comware_cmdline)
 
-        # HP V1950
+        # HP V1950 r2432P06
         cmd 'xtd-cli-mode on', /(#{@node.prompt}|Continue)/
         cmd 'y', /(#{@node.prompt}|input password)/
         cmd vars(:comware_cmdline)
+
+        # HP V1950 OS r3208 (v7.1)
+        # HPE Office Connect 1950
+        cmd 'xtd-cli-mode', /(#{@node.prompt}|Continue|Switch)/
+        cmd 'y', /(#{@node.prompt}|input password|Password:)/
+        cmd vars(:comware_cmdline)
       end
     end
 

data/lib/oxidized/model/cumulus.rb

@@ -11,72 +11,86 @@ class Cumulus < Oxidized::Model
     cfg.cut_both
   end
 
+  cmd :secret do |cfg|
+    cfg.gsub! /password (\S+)/, 'password <hidden>'
+    cfg
+  end
+
   # show the persistent configuration
   pre do
-    # Set FRR or Quagga in config
-    routing_daemon = vars(:cumulus_routing_daemon) ? vars(:cumulus_routing_daemon).downcase : 'quagga'
-    routing_conf_file = routing_daemon == 'frr' ? 'frr.conf' : 'Quagga.conf'
-    routing_daemon_shout = routing_daemon.upcase
+    use_nclu = vars(:cumulus_use_nclu) || false
 
-    cfg = add_comment 'THE HOSTNAME'
-    cfg += cmd 'cat /etc/hostname'
+    if use_nclu
+      cfg = cmd 'net show configuration commands'
+    else
+      # Set FRR or Quagga in config
+      routing_daemon = vars(:cumulus_routing_daemon) ? vars(:cumulus_routing_daemon).downcase : 'quagga'
+      routing_conf_file = routing_daemon == 'frr' ? 'frr.conf' : 'Quagga.conf'
+      routing_daemon_shout = routing_daemon.upcase
 
-    cfg += add_comment 'THE HOSTS'
-    cfg += cmd 'cat /etc/hosts'
+      cfg = add_comment 'THE HOSTNAME'
+      cfg += cmd 'cat /etc/hostname'
 
-    cfg += add_comment 'THE INTERFACES'
-    cfg += cmd 'grep -r "" /etc/network/interface* | cut -d "/" -f 4-'
+      cfg += add_comment 'THE HOSTS'
+      cfg += cmd 'cat /etc/hosts'
 
-    cfg += add_comment 'RESOLV.CONF'
-    cfg += cmd 'cat /etc/resolv.conf'
+      cfg += add_comment 'THE INTERFACES'
+      cfg += cmd 'grep -r "" /etc/network/interface* | cut -d "/" -f 4-'
 
-    cfg += add_comment 'NTP.CONF'
-    cfg += cmd 'cat /etc/ntp.conf'
+      cfg += add_comment 'RESOLV.CONF'
+      cfg += cmd 'cat /etc/resolv.conf'
 
-    cfg += add_comment 'SNMP settings'
-    cfg += cmd 'cat /etc/snmp/snmpd.conf'
+      cfg += add_comment 'NTP.CONF'
+      cfg += cmd 'cat /etc/ntp.conf'
 
-    cfg += add_comment "#{routing_daemon_shout} DAEMONS"
-    cfg += cmd "cat /etc/#{routing_daemon}/daemons"
+      cfg += add_comment 'SNMP settings'
+      cfg += cmd 'cat /etc/snmp/snmpd.conf'
 
-    cfg += add_comment "#{routing_daemon_shout} ZEBRA"
-    cfg += cmd "cat /etc/#{routing_daemon}/zebra.conf"
+      cfg += add_comment "#{routing_daemon_shout} DAEMONS"
+      cfg += cmd "cat /etc/#{routing_daemon}/daemons"
 
-    cfg += add_comment "#{routing_daemon_shout} BGP"
-    cfg += cmd "cat /etc/#{routing_daemon}/bgpd.conf"
+      cfg += add_comment "#{routing_daemon_shout} ZEBRA"
+      cfg += cmd "cat /etc/#{routing_daemon}/zebra.conf"
 
-    cfg += add_comment "#{routing_daemon_shout} OSPF"
-    cfg += cmd "cat /etc/#{routing_daemon}/ospfd.conf"
+      cfg += add_comment "#{routing_daemon_shout} BGP"
+      cfg += cmd "cat /etc/#{routing_daemon}/bgpd.conf"
 
-    cfg += add_comment "#{routing_daemon_shout} OSPF6"
-    cfg += cmd "cat /etc/#{routing_daemon}/ospf6d.conf"
+      cfg += add_comment "#{routing_daemon_shout} OSPF"
+      cfg += cmd "cat /etc/#{routing_daemon}/ospfd.conf"
 
-    cfg += add_comment "#{routing_daemon_shout} CONF"
-    cfg += cmd "cat /etc/#{routing_daemon}/#{routing_conf_file}"
+      cfg += add_comment "#{routing_daemon_shout} OSPF6"
+      cfg += cmd "cat /etc/#{routing_daemon}/ospf6d.conf"
 
-    cfg += add_comment 'MOTD'
-    cfg += cmd 'cat /etc/motd'
+      cfg += add_comment "#{routing_daemon_shout} CONF"
+      cfg += cmd "cat /etc/#{routing_daemon}/#{routing_conf_file}"
 
-    cfg += add_comment 'PASSWD'
-    cfg += cmd 'cat /etc/passwd'
+      cfg += add_comment 'MOTD'
+      cfg += cmd 'cat /etc/motd'
 
-    cfg += add_comment 'SWITCHD'
-    cfg += cmd 'cat /etc/cumulus/switchd.conf'
+      cfg += add_comment 'PASSWD'
+      cfg += cmd 'cat /etc/passwd'
 
-    cfg += add_comment 'PORTS'
-    cfg += cmd 'cat /etc/cumulus/ports.conf'
+      cfg += add_comment 'SWITCHD'
+      cfg += cmd 'cat /etc/cumulus/switchd.conf'
 
-    cfg += add_comment 'TRAFFIC'
-    cfg += cmd 'cat /etc/cumulus/datapath/traffic.conf'
+      cfg += add_comment 'PORTS'
+      cfg += cmd 'cat /etc/cumulus/ports.conf'
 
-    cfg += add_comment 'ACL'
-    cfg += cmd 'cat /etc/cumulus/acl/policy.conf'
+      cfg += add_comment 'TRAFFIC'
+      cfg += cmd 'cat /etc/cumulus/datapath/traffic.conf'
 
-    cfg += add_comment 'VERSION'
-    cfg += cmd 'cat /etc/cumulus/etc.replace/os-release'
+      cfg += add_comment 'ACL'
+      cfg += cmd 'cat /etc/cumulus/acl/policy.conf'
 
-    cfg += add_comment 'License'
-    cfg += cmd 'cl-license'
+      cfg += add_comment 'DHCP-RELAY'
+      cfg += cmd 'cat /etc/default/isc-dhcp-relay'
+
+      cfg += add_comment 'VERSION'
+      cfg += cmd 'cat /etc/cumulus/etc.replace/os-release'
+
+      cfg += add_comment 'License'
+      cfg += cmd 'cl-license'
+    end
 
     cfg
   end

data/lib/oxidized/model/dellx.rb

@@ -20,9 +20,7 @@ class DellX < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
-    if @stackable.nil?
-      @stackable = true if cfg =~ /(U|u)nit\s/
-    end
+    @stackable = true if @stackable.nil? && (cfg =~ /(U|u)nit\s/)
     cfg = cfg.split("\n").reject { |line| line[/Up\sTime/] }
     comment cfg.join("\n") + "\n"
   end

data/lib/oxidized/model/dlink.rb

@@ -1,5 +1,6 @@
 class Dlink < Oxidized::Model
   # D-LINK Switches
+  # Add support dgs 1100 series (tested only with dgs-1100-10/me)
 
   prompt /^(\r*[\w\s.@()\/:-]+[#>]\s?)$/
   comment '# '
@@ -26,7 +27,7 @@ class Dlink < Oxidized::Model
   cmd 'show config current'
 
   cfg :telnet do
-    username /\r*[Uu]ser[Nn]ame:/
+    username /\r*([\w\s.@()\/:-]+)?([Uu]ser[Nn]ame|[Ll]ogin):/
     password /\r*[Pp]ass[Ww]ord:/
   end
 

data/lib/oxidized/model/edgecos.rb

@@ -1,6 +1,12 @@
 class EdgeCOS < Oxidized::Model
   comment '! '
 
+  # Handle pager for ES3526XA-V2
+  expect /^---More---.*$/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
   cmd :secret do |cfg|
     cfg.gsub!(/password \d+ (\S+).*/, '<secret removed>')
     cfg.gsub!(/community (\S+)/, 'community <hidden>')
@@ -8,10 +14,18 @@ class EdgeCOS < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[0..-2].join
+    # Do not show errors for commands that are not supported on some devices
+    cfg.gsub! /^(% Invalid input detected at '\^' marker\.|^\s+\^)$/, ''
+    # Handle pager for ES3526XA-V2
+    cfg.gsub! /^([\b]{10}\s{10}[\b]{10})/, ''
+    cfg.cut_both
   end
 
-  cmd 'show running-config'
+  cmd 'show running-config' do |cfg|
+    # Remove "building running-config, please wait..." message
+    cfg.gsub! /^Building running configuration.*\n/, ''
+    cfg.cut_head
+  end
 
   cmd 'show system' do |cfg|
     cfg.gsub! /^.*\sUp Time\s*:.*\n/i, ''
@@ -20,6 +34,7 @@ class EdgeCOS < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
+    cfg.gsub! /^.*\suptime is.*\n/i, ''
     comment cfg
   end
 
@@ -43,7 +58,12 @@ class EdgeCOS < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
+    post_login do
+      send "enable\n" if vars(:enable) == true
+    end
     post_login 'terminal length 0'
+    post_login 'terminal width 300'
+    pre_logout 'exit' if vars(:enable) == true
     pre_logout 'exit'
   end
 end

data/lib/oxidized/model/edgeswitch.rb

@@ -16,11 +16,11 @@ class EdgeSwitch < Oxidized::Model
 
   cfg :telnet, :ssh do
     post_login do
-      if vars :enable
-        send "enable\n"
+      if vars(:enable) == true
+        cmd "enable"
+      elsif vars(:enable)
+        cmd "enable", /^[pP]assword:/
         cmd vars(:enable)
-      else
-        cmd 'enable'
       end
       cmd 'terminal length 0'
     end

data/lib/oxidized/model/eltex.rb

@@ -0,0 +1,48 @@
+class Eltex < Oxidized::Model
+  # Tested with MES2324FB Version: 4.0.7.1 Build: 37 (master)
+
+  prompt /^\s?[\w.@\(\)-]+[#>]\s?$/
+  comment '! '
+
+  cmd :all do |cfg|
+    cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
+    cfg.cut_both
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    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! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
+    cfg.gsub! /^username \S+ password \d \S+/, '<secret hidden>'
+    cfg.gsub! /^enable password \d \S+/, '<secret hidden>'
+    cfg.gsub! /wpa-psk ascii \d \S+/, '<secret hidden>'
+    cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg
+  end
+
+  cfg :telnet do
+    username /^(User Name):/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    # preferred way to handle additional passwords
+    post_login do
+      if vars(:enable) == true
+        cmd "enable"
+      elsif vars(:enable)
+        cmd "enable", /^[pP]assword:/
+        cmd vars(:enable)
+      end
+    end
+    post_login 'terminal datadump'
+    pre_logout 'disable'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/enterasys.rb

@@ -1,9 +1,15 @@
 class Enterasys < Oxidized::Model
   # Enterasys B3/C3 models #
 
-  prompt /^.+\w\(su\)->\s?$/
+  prompt /^.+\w\((su|rw)\)->\s?$/
 
-  comment  '!'
+  comment '!'
+
+  # Handle paging
+  expect /^--More--.*$/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
 
   cmd :all do |cfg|
     cfg.each_line.to_a[2..-3].map { |line| line.delete("\r").rstrip }.join("\n") + "\n"
@@ -13,6 +19,10 @@ class Enterasys < Oxidized::Model
     comment cfg
   end
 
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
   cmd 'show config' do |cfg|
     cfg.gsub! /^This command shows non-default configurations only./, ''
     cfg.gsub! /^Use 'show config all' to show both default and non-default configurations./, ''
@@ -22,7 +32,12 @@ class Enterasys < Oxidized::Model
     cfg
   end
 
-  cfg :ssh do
+  cfg :telnet do
+    username /^Username:/i
+    password /^Password:/i
+  end
+
+  cfg :telnet, :ssh do
     pre_logout 'exit'
   end
 end

data/lib/oxidized/model/enterasys800.rb

@@ -0,0 +1,29 @@
+class Enterasys800 < Oxidized::Model
+  # Enterasys 800 models #
+  # Tested with 08H20G4-24 Fast Ethernet Switch Firmware: Build 01.01.01.0017
+  comment '# '
+
+  prompt /([\w \(:.@-]+[#>]\s?)$/
+
+  cfg :telnet do
+    username /UserName:/
+    password /PassWord:/
+  end
+
+  cfg :telnet do
+    post_login 'disable clipaging'
+  end
+
+  cfg :telnet do
+    pre_logout 'logout'
+  end
+
+  cmd :all do |cfg|
+    cfg = cfg.cut_both
+    cfg = cfg.gsub /^[\r\n]|^\s\s\s/, ''
+    cfg = cfg.gsub /Command: show config effective/, ''
+    cfg
+  end
+
+  cmd 'show config effective'
+end

data/lib/oxidized/model/eos.rb

@@ -1,7 +1,7 @@
 class EOS < Oxidized::Model
   # Arista EOS model #
 
-  prompt /^.+[#>]\s?$/
+  prompt /^.+[#>]$/
 
   comment  '! '
 
@@ -14,6 +14,7 @@ class EOS < Oxidized::Model
     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! /^(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>'
     cfg

data/lib/oxidized/model/fabricos.rb

@@ -6,7 +6,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(/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:/) }.join
   end
 
   cmd 'configShow -all' do |cfg|