oxidized 0.20.0 → 0.28.0

data/lib/oxidized/model/dlink.rb

@@ -1,7 +1,7 @@
 class Dlink < Oxidized::Model
   # D-LINK Switches
 
-  prompt /^(\r*[\w.@():-]+[#>]\s?)$/
+  prompt /^(\r*[\w\s.@()\/:-]+[#>]\s?)$/
   comment '# '
 
   cmd :secret do |cfg|
@@ -11,10 +11,11 @@ class Dlink < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[2..-2].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
+    cfg.each_line.to_a[2..-2].map { |line| line.delete("\r").rstrip }.join("\n") + "\n"
   end
 
   cmd 'show switch' do |cfg|
+    cfg.gsub! /^System Uptime\s.+/, '' # Omit constantly changing uptime info
     comment cfg
   end
 
@@ -25,8 +26,8 @@ class Dlink < Oxidized::Model
   cmd 'show config current'
 
   cfg :telnet do
-    username /\r*username:/
-    password /\r*password:/
+    username /\r*[Uu]ser[Nn]ame:/
+    password /\r*[Pp]ass[Ww]ord:/
   end
 
   cfg :telnet, :ssh do

data/lib/oxidized/model/dnos.rb

@@ -1,16 +1,19 @@
-class DNOS  < Oxidized::Model
-
+class DNOS < Oxidized::Model
   # Force10 DNOS model #
 
   comment  '! '
 
   cmd :all do |cfg|
+    cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
+    cfg.gsub! /(uptime is)(\s.+)/, '\\1 <removed>' # Omit changing uptime info
     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.gsub! /password (\d+) (\S+).*/, '<secret hidden>'
+    cfg.gsub! /^(tacacs-server key \d+) (\S+).*/, '\\1 <secret hidden>'
     cfg
   end
 
@@ -22,6 +25,10 @@ class DNOS  < Oxidized::Model
     comment cfg
   end
 
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
   cmd 'show running-config' do |cfg|
     cfg = cfg.each_line.to_a[3..-1].join
     cfg
@@ -42,7 +49,6 @@ class DNOS  < Oxidized::Model
     post_login 'terminal length 0'
     post_login 'terminal width 0'
     pre_logout 'exit'
-    pre_logout 'exit'    
+    pre_logout 'exit'
   end
-
 end

data/lib/oxidized/model/eciapollo.rb

@@ -0,0 +1,34 @@
+# ECI Telecom Apollo
+# Tested on OPT9608 systems via SSH and telnet
+
+class ECIapollo < Oxidized::Model
+  prompt /^([\w.@()-]+[#>]\s?)$/
+  comment '# '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub!(/community (\S+) {/, 'community <hidden> {')
+    cfg.gsub!(/ "\$\d\$\S+; ## SECRET-DATA/, ' <secret removed>;')
+    cfg
+  end
+
+  cfg :telnet do
+    username(/^login:/)
+    password(/^Password:/)
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'set cli screen-length 0'
+    post_login 'set cli screen-width 0'
+    pre_logout 'exit'
+  end
+
+  cmd('show version')           { |cfg| comment cfg }
+  cmd('show system licenses')   { |cfg| comment cfg }
+  cmd('show configuration')     { |cfg| comment cfg }
+  cmd('show configuration | display-set') { |cfg| cfg }
+  cmd('show chassis inventory') { |cfg| comment cfg }
+end

data/lib/oxidized/model/edgecos.rb

@@ -0,0 +1,49 @@
+class EdgeCOS < 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 system' do |cfg|
+    cfg.gsub! /^.*\sUp Time\s*:.*\n/i, ''
+    cfg.gsub! /^(.*\sTemperature \d*:).*\n/i, '\\1 <removed>'
+    comment cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show watchdog' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show interfaces transceiver' do |cfg|
+    cfg.gsub! /(\d\d)!/, '\\1 ' # alarm indicators of DDM thresholds
+    cfg.gsub! /^(\s*Temperature\s*:).*/, '\1 <hidden>'
+    cfg.gsub! /^(\s*Vcc\s*:).*/, '\1 <hidden>'
+    cfg.gsub! /^(\s*Bias Current\s*:).*/, '\1 <hidden>'
+    cfg.gsub! /^(\s*TX Power\s*:).*/, '\1 <hidden>'
+    cfg.gsub! /^(\s*RX Power\s*:).*/, '\1 <hidden>'
+    comment cfg
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/edgeos.rb

@@ -1,19 +1,27 @@
 class Edgeos < Oxidized::Model
-
   # EdgeOS #
 
-  prompt /\@.*?\:~\$\s/
+  prompt /@.*?:~\$\s/
 
   cmd :all do |cfg|
-    cfg = cfg.lines.to_a[1..-2].join
+    cfg.lines.to_a[1..-2].join
   end
 
   cmd :secret do |cfg|
+    cfg.gsub! /encrypted-password (\S+).*/, 'encrypted-password <secret removed>'
+    cfg.gsub! /plaintext-password (\S+).*/, 'plaintext-password <secret removed>'
+    cfg.gsub! /password (\S+).*/, 'password <secret removed>'
+    cfg.gsub! /pre-shared-secret (\S+).*/, 'pre-shared-secret <secret removed>'
     cfg.gsub! /community (\S+) {/, 'community <hidden> {'
     cfg
   end
 
-  cmd 'show configuration | no-more'
+  cmd 'show version | no-more' do |cfg|
+    cfg.gsub! /^Uptime:\s.+/, ''
+    comment cfg
+  end
+
+  cmd 'show configuration commands | no-more'
 
   cfg :telnet do
     username  /login:\s/
@@ -23,5 +31,4 @@ class Edgeos < Oxidized::Model
   cfg :telnet, :ssh do
     pre_logout 'exit'
   end
-
 end

data/lib/oxidized/model/edgeswitch.rb

@@ -1,13 +1,12 @@
 class EdgeSwitch < Oxidized::Model
-
-# Ubiquiti EdgeSwitch #
+  # Ubiquiti EdgeSwitch #
 
   comment '!'
 
   prompt /\(.*\)\s[#>]/
 
   cmd 'show running-config' do |cfg|
-    cfg.each_line.to_a[2..-2].reject { |line| line.match /System Up Time.*/ or line.match /Current SNTP Synchronized Time.*/ }.join
+    cfg.each_line.to_a[2..-2].reject { |line| line.match(/System Up Time.*/) || line.match(/Current SNTP Synchronized Time.*/) }.join
   end
 
   cfg :telnet do
@@ -28,5 +27,4 @@ class EdgeSwitch < Oxidized::Model
     pre_logout 'quit'
     pre_logout 'n'
   end
-
 end

data/lib/oxidized/model/enterasys.rb

@@ -0,0 +1,28 @@
+class Enterasys < Oxidized::Model
+  # Enterasys B3/C3 models #
+
+  prompt /^.+\w\(su\)->\s?$/
+
+  comment  '!'
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[2..-3].map { |line| line.delete("\r").rstrip }.join("\n") + "\n"
+  end
+
+  cmd 'show system hardware' 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./, ''
+    cfg.gsub! /^!|#.*/, ''
+    cfg.gsub! /^$\n/, ''
+
+    cfg
+  end
+
+  cfg :ssh do
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/eos.rb

@@ -1,5 +1,4 @@
 class EOS < Oxidized::Model
-
   # Arista EOS model #
 
   prompt /^.+[#>]\s?$/
@@ -7,15 +6,17 @@ class EOS < Oxidized::Model
   comment  '! '
 
   cmd :all do |cfg|
-     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+).*/, '<secret hidden>'
-     cfg.gsub! /^(enable secret).*/, '\\1 <configuration removed>'
-     cfg.gsub! /^(tacacs-server key \d+).*/, '\\1 <configuration removed>'
-     cfg
+    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! /^(tacacs-server key \d+).*/, '\\1 <configuration removed>'
+    cfg.gsub! /( {6}key) (\h+ 7) (\h+).*/, '\\1 <secret hidden>'
+    cfg
   end
 
   cmd 'show inventory | no-more' do |cfg|
@@ -41,5 +42,4 @@ class EOS < Oxidized::Model
     end
     pre_logout 'exit'
   end
-
 end

data/lib/oxidized/model/fabricos.rb

@@ -1,22 +1,20 @@
 class FabricOS < Oxidized::Model
-
   # Brocade Fabric OS model #
   ## FIXME: Only ssh exec mode support, no telnet, no ssh screenscraping
 
   prompt /^([\w]+:+[\w]+[>]\s)$/
-  comment  '# '
+  comment '# '
 
   cmd 'chassisShow' do |cfg|
-    comment cfg.each_line.reject { |line| line.match /Time Awake:/ or line.match /Power Usage \(Watts\):/ or line.match /Time Alive:/ or line.match /Update:/ }.join
+    comment cfg.each_line.reject { |line| line.match(/Time Awake:/) || line.match(/Power Usage \(Watts\):/) || line.match(/Time Alive:/) || line.match(/Update:/) }.join
   end
 
   cmd 'configShow -all' do |cfg|
-    cfg = cfg.each_line.reject { |line| line.match /date = /}.join
+    cfg = cfg.each_line.reject { |line| line.match /date = / }.join
     cfg
   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
-
 end

data/lib/oxidized/model/fastiron.rb

@@ -0,0 +1,66 @@
+class FastIron < Oxidized::Model
+  prompt /^([\w.@()-]+[#>]\s?)$/
+  comment  '! '
+
+  cmd :all do |cfg|
+    # 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.cut_both
+  end
+
+  cmd 'show version' do |cfg|
+    comments = []
+    comments << cfg.lines.first
+    lines = cfg.lines
+    lines.each_with_index do |line, _i|
+      comments << "Version: #{Regexp.last_match(1)}" if line =~ /^\s+SW: Version (.*)$/
+
+      comments << "Boot-Monitor Version: #{Regexp.last_match(1)}" if line =~ /^\s+Compressed Boot-Monitor Image size = \d+, Version:(.*)$/
+
+      comments << "Serial: #{Regexp.last_match(1)}" if line =~ /^\s+Serial  #:(.*)$/
+    end
+    comments << "\n"
+    comment comments.join "\n"
+  end
+
+  cmd 'show module' do |cfg|
+    cfg.gsub! /^$\n/, ''
+    cfg.gsub! /^/, 'Modules: ' unless cfg.empty?
+    comment "#{cfg}\n"
+  end
+
+  cmd 'show media | exclude EMPTY' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show hardware-info' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show stack' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config'
+
+  cfg :telnet do
+    username /^.* login: /
+    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 'skip-page-display'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/fiberdriver.rb

@@ -3,7 +3,7 @@ class FiberDriver < Oxidized::Model
   comment "! "
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
   cmd 'show inventory' do |cfg|
     comment cfg
@@ -13,7 +13,7 @@ class FiberDriver < Oxidized::Model
     cfg.each_line.to_a[3..-1].join
     cfg.gsub! /^Building configuration.*$/, ''
     cfg.gsub! /^Current configuration:.*$$/, ''
-    cfg.gsub! /^! Configuration saved on .*$/, ''
+    cfg.gsub! /^! Configuration (saved|generated) on .*$/, ''
     cfg
   end
 

data/lib/oxidized/model/firebrick.rb

@@ -0,0 +1,31 @@
+class Firebrick < Oxidized::Model
+  # Firebrick #
+  prompt /\x0a\x1b\x5b\x32\x4b\x0d.*>\s/
+
+  cmd :all do |cfg|
+    # remove arbitrary whitespace after commands.
+    cfg.each_line.to_a[1..-2].drop_while { |e| e.match /^\s+$/ }.join
+  end
+
+  cmd 'show status' do |cfg|
+    cfg.gsub! /Status/, ''
+    cfg.gsub! /------/, ''
+    cfg.gsub! /Uptime.*/, ''
+    cfg.gsub! /Current time.*/, ''
+    cfg.gsub! /RAM.*/, ''
+    cfg.gsub! /Warranty.*/, ''
+
+    comment cfg
+  end
+
+  cmd 'show configuration'
+
+  cfg :telnet do
+    username /Username:\s?/
+    password /Password:\s?/
+  end
+
+  cfg :telnet, :ssh do
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/firelinuxos.rb

@@ -0,0 +1,41 @@
+class FireLinuxOS < Oxidized::Model
+  # Fire Linux OS is what the new FTD (FirePOWER) series devices from Cisco run. At the backend, it's mostly identical to ASA's.
+
+  prompt /^[#>]\(?.+\)?\s?/
+  comment  '! '
+
+  cmd :all do |cfg|
+    cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /enable password (\S+) (.*)/, 'enable password <secret hidden> \2'
+    cfg.gsub! /username (\S+) password (\S+) (.*)/, 'username \1 password <secret hidden> \3'
+    cfg.gsub! /(ikev[12] ((remote|local)-authentication )?pre-shared-key) (\S+)/, '\1 <secret hidden>'
+    cfg.gsub! /^(aaa-server TACACS\+? \(\S+\) host.*\n\skey) \S+$/mi, '\1 <secret hidden>'
+    cfg.gsub! /ldap-login-password (\S+)/, 'ldap-login-password <secret hidden>'
+    cfg.gsub! /^snmp-server host (.*) community (\S+)/, 'snmp-server host \1 community <secret hidden>'
+    cfg
+  end
+
+  cmd 'show version system' do |cfg|
+    cfg = cfg.each_line.reject { |line| line.match /(\s+up\s+\d+\s+)|(.*days.*)/ }
+    cfg = cfg.join
+    comment cfg
+  end
+
+  cmd 'show inventory' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config all' do |cfg|
+    cfg = cfg.each_line.to_a[3..-1].join
+    cfg.gsub! /^: [^\n]*\n/, ''
+    cfg
+  end
+
+  cfg :ssh do
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/firewareos.rb

@@ -1,10 +1,9 @@
 class FirewareOS < Oxidized::Model
-
-  prompt /^([\w.@-]+[#>]\s?)$/
+  prompt /^\[?\w*\]?\w*?(<\w*>)?(#|>)\s*$/
   comment  '-- '
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
   # Handle Logon Disclaimer added in XTM 11.9.3
@@ -15,7 +14,7 @@ class FirewareOS < Oxidized::Model
 
   cmd 'show sysinfo' do |cfg|
     # avoid commits due to uptime
-    cfg = cfg.each_line.select { |line| not line.match /(.*time.*)|(.*memory.*)|(.*cpu.*)/ }
+    cfg = cfg.each_line.reject { |line| line.match /(.*time.*)|(.*memory.*)|(.*cpu.*)/ }
     cfg = cfg.join
     comment cfg
   end
@@ -25,6 +24,4 @@ class FirewareOS < Oxidized::Model
   cfg :ssh do
     pre_logout 'exit'
   end
-
 end
-

data/lib/oxidized/model/fortios.rb

@@ -1,8 +1,7 @@
 class FortiOS < Oxidized::Model
+  comment '# '
 
-  comment  '# '
-
-  prompt /^([-\w\.\~]+(\s[\(\w\-\.\)]+)?\~?\s?[#>$]\s?)$/
+  prompt /^([-\w.~]+(\s[(\w\-.)]+)?~?\s?[#>$]\s?)$/
 
   expect /^--More--\s$/ do |data, re|
     send ' '
@@ -15,14 +14,28 @@ class FortiOS < Oxidized::Model
   end
 
   cmd :secret do |cfg|
-    cfg.gsub! /(set (?:passwd|password|psksecret|secret|key ENC)).*/, '\\1 <configuration removed>'
-    cfg.gsub! /(set private-key).*-+END ENCRYPTED PRIVATE KEY-*"$/m , '\\1 <configuration removed>'
+    # ENC indicates an encrypted password, and secret indicates a secret string
+    cfg.gsub! /(set .+ ENC) .+/, '\\1 <configuration removed>'
+    cfg.gsub! /(set .*secret) .+/, '\\1 <configuration removed>'
+    # A number of other statements also contains sensitive strings
+    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 ca ).*?-+END CERTIFICATE-+"$/m, '\\1<configuration removed>'
+    cfg.gsub! /(set csr ).*?-+END CERTIFICATE REQUEST-+"$/m, '\\1<configuration removed>'
     cfg
   end
 
   cmd 'get system status' do |cfg|
-    @vdom_enabled = cfg.include? 'Virtual domain configuration: enable'
-    cfg.gsub!(/(System time: )(.*)/, '\1<stripped>\3')
+    @vdom_enabled = cfg.match /Virtual domain configuration: (enable|multiple)/
+    cfg.gsub! /(System time:).*/, '\\1 <stripped>'
+    cfg.gsub! /(Cluster uptime:).*/, '\\1 <stripped>'
+    cfg.gsub! /(Virus-DB|Extended DB|IPS-DB|IPS-ETDB|APP-DB|INDUSTRIAL-DB|Botnet DB|IPS Malicious URL Database).*/, '\\1 <db version stripped>'
+    comment cfg
+  end
+
+  cmd 'get system ha status' do |cfg|
+    cfg = cfg.each_line.select { |line| line.match /^(HA Health Status|Mode|Model|Master|Slave\s+):/ }.join
     comment cfg
   end
 
@@ -30,21 +43,22 @@ class FortiOS < Oxidized::Model
     cfg = []
     cfg << cmd('config global') if @vdom_enabled
 
-    cfg << cmd('get hardware status') do |cfg|
-       comment cfg
+    cfg << cmd('get hardware status') do |cfg_hw|
+      comment cfg_hw
     end
 
-    #default behaviour: include autoupdate output (backwards compatibility)
-    #do not include if variable "show_autoupdate" is set to false
-    if  defined?(vars(:fortios_autoupdate)).nil? || vars(:fortios_autoupdate)
-       cfg << cmd('diagnose autoupdate version') do |cfg|
-          comment cfg.each_line.reject { |line| line.match /Last Update|Result/ }.join
-       end
+    # default behaviour: include autoupdate output (backwards compatibility)
+    # do not include if variable "show_autoupdate" is set to false
+    if defined?(vars(:fortios_autoupdate)).nil? || vars(:fortios_autoupdate)
+      cfg << cmd('diagnose autoupdate version') do |cfg_auto|
+        cfg_auto.gsub! /(FDS Address\n---------\n).*/, '\\1IP Address removed'
+        comment cfg_auto.each_line.reject { |line| line.match /Last Update|Result/ }.join
+      end
     end
 
-cfg << cmd('end') if @vdom_enabled
+    cfg << cmd('end') if @vdom_enabled
 
-    cfg << cmd('show')
+    cfg << cmd('show full-configuration | grep .')
     cfg.join "\n"
   end
 
@@ -56,6 +70,4 @@ cfg << cmd('end') if @vdom_enabled
   cfg :telnet, :ssh do
     pre_logout "exit\n"
   end
-
 end
-

data/lib/oxidized/model/ftos.rb

@@ -1,5 +1,4 @@
-class FTOS  < Oxidized::Model
-
+class FTOS < Oxidized::Model
   # Force10 FTOS model #
 
   comment  '! '
@@ -8,13 +7,18 @@ class FTOS  < 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.gsub! /(secret \d* {0,1})\S+(.*)/, '\\1<secret hidden>\\2'
+    cfg.gsub! /(password \d+) \S+(.*)/, '\\1 <hash hidden>\\2'
+    cfg.gsub! /(^snmp-server.*version \S+) \S+(.*)/, '\\1 <community removed>\\2'
+    cfg.gsub! /(^radius-server.*key \d )\S+/, '\\1<hash hidden>\\2'
     cfg
   end
 
   cmd 'show inventory' do |cfg|
+    # Old versions of FTOS can occasionally return data that triggers encoding errors.
+    cfg.encode!("UTF-8", invalid: :replace, undef: :replace, replace: "")
     comment cfg
   end
 
@@ -43,5 +47,4 @@ class FTOS  < Oxidized::Model
     end
     pre_logout 'exit'
   end
-
 end

data/lib/oxidized/model/fujitsupy.rb

@@ -1,23 +1,22 @@
 class FujitsuPY < Oxidized::Model
-
-  prompt /^(\([\w.-]*\)\s#|^\S+\#\s)$/
+  prompt /^(\([\w.-]*\)\s#|^\S+#\s)$/
   comment  '! '
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    cfg.cut_both
   end
 
-# 1Gbe switch
+  # 1Gbe switch
   cmd 'show version' do |cfg|
     cfg.gsub! /^(<ERROR> : 2 : format error)$/, ''
     comment cfg
   end
 
-# 10Gbe switch
+  # 10Gbe switch
   cmd 'show system information' do |cfg|
     cfg.gsub! /^Current-time : [\w\s:]*$/, ''
     cfg.gsub! /^(\s{33}\^)$/, ''
-    cfg.gsub! /^(\% Invalid input detected at '\^' marker.)$/, ''
+    cfg.gsub! /^(% Invalid input detected at '\^' marker.)$/, ''
     comment cfg
   end
 
@@ -38,5 +37,4 @@ class FujitsuPY < Oxidized::Model
       send "n\n"
     end
   end
-
 end