oxidized 0.30.1 → 0.32.0

data/lib/oxidized/model/cumulus.rb

@@ -1,7 +1,19 @@
 class Cumulus < Oxidized::Model
   using Refinements
 
-  prompt /^(([\w.-]*)@(.*)):/
+  # Remove ANSI escape codes
+  expect /\e\[[0-?]*[ -\/]*[@-~]\r?/ do |data, re|
+    data.gsub re, ''
+  end
+
+  # The prompt contains ANSI escape codes, which have already been removed
+  # from the expect call above
+  # ^                 : match begin of line, to have the most specific prompt
+  # [\w.-]+@[\w.-]+   : user@hostname
+  # (:mgmt)?          : optional when logged in out of band
+  # :~[#$] $          : end of prompt, containing the linux path,
+  #                     which is always "~" in our context
+  prompt /^[\w.-]+@[\w.-]+(:mgmt)?:~[#$] $/
   comment '# '
 
   # add a comment in the final conf
@@ -21,9 +33,12 @@ class Cumulus < Oxidized::Model
   # show the persistent configuration
   pre do
     use_nclu = vars(:cumulus_use_nclu) || false
+    use_nvue = vars(:cumulus_use_nvue) || false
 
     if use_nclu
       cfg = cmd 'net show configuration commands'
+    elsif use_nvue
+      cfg = cmd 'nv config show --color off'
     else
       # Set FRR or Quagga in config
       routing_daemon = vars(:cumulus_routing_daemon) ? vars(:cumulus_routing_daemon).downcase : 'quagga'
@@ -76,7 +91,9 @@ class Cumulus < Oxidized::Model
       cfg += cmd 'cat /etc/cumulus/switchd.conf'
 
       cfg += add_comment 'PORTS'
-      cfg += cmd 'cat /etc/cumulus/ports.conf'
+      # in some configurations, ports.conf has no trailing Line Feed,
+      # which breaks the prompt, so we add one
+      cfg += cmd "cat /etc/cumulus/ports.conf; echo"
 
       cfg += add_comment 'TRAFFIC'
       cfg += cmd 'cat /etc/cumulus/datapath/traffic.conf'

data/lib/oxidized/model/dlink.rb

@@ -37,6 +37,7 @@ class Dlink < Oxidized::Model
 
   cfg :telnet, :ssh do
     post_login 'disable clipaging'
+    post_login 'enable admin' if vars(:enable) == true
     pre_logout 'logout'
   end
 end

data/lib/oxidized/model/dlinknextgen.rb

@@ -35,6 +35,9 @@ class DlinkNextGen < Oxidized::Model
   cmd 'show running-config' do |cfg|
     cfg.gsub! /^(snmp-server community ["\w]+) \S+/, '\\1 <removed>'
     cfg.gsub! /^(username [\w.@-]+ privilege \d{1,2} password \d{1,2}) \S+/, '\\1 <removed>'
+    cfg.gsub! /^(!System Up Time).*/, '\\1 <removed>'
+    cfg.gsub! /^(!Current SNTP Synchronized Time:).*/, '\\1 <removed>'
+    cfg.gsub! /^(\s+ppp (chap|pap) password \d) .+/, '\\1 <secret hidden>'
     cfg
   end
 

data/lib/oxidized/model/edgecos.rb

@@ -31,7 +31,8 @@ class EdgeCOS < Oxidized::Model
 
   cmd 'show system' do |cfg|
     cfg.gsub! /^.*\sUp Time\s*:.*\n/i, ''
-    cfg.gsub! /^(.*\sTemperature \d*\s*:\s*).*/i, '\\1<removed>'
+    cfg.gsub! /(\sTemperature \d*:)\s*\d+ degrees/, '\\1 <temperature values hidden>'
+    cfg.gsub! /^!?\s*Fan \d+ speed:\s+\d+ rpm\s+Fan \d+ speed:\s+\d+ rpm\s+Fan \d+ speed:\s+\d+ rpm$/, '<fan speeds hidden>'
     comment cfg
   end
 

data/lib/oxidized/model/enterprise_sonic.rb

@@ -0,0 +1,46 @@
+class Enterprise_SONiC < Oxidized::Model # rubocop:disable Naming/ClassAndModuleCamelCase
+  using Refinements
+
+  # Remove ANSI escape codes
+  expect /\e\[[0-?]*[ -\/]*[@-~]\r?/ do |data, re|
+    data.gsub re, ''
+  end
+
+  # Matches both sonic-cli and linux terminal
+  prompt /^(?:[\w.-]+@[\w.-]+:[~\w\/-]+\$|[\w.-]+#)\s*/
+  comment "# "
+
+  def add_comment(comment)
+    "\n##### #{comment} #####\n"
+  end
+
+  post do
+    cmd 'show running-configuration' do |cfg|
+      add_comment('CONFIGURATION') + cfg
+    end
+  end
+
+  cmd 'show version' do |cfg|
+    cfg = cfg.each_line.reject { |line| line.match /Uptime/ }.join
+    add_comment('VERSION') + cfg
+  end
+
+  cmd 'show platform syseeprom' do |cfg|
+    add_comment('SYSEEPROM') + cfg
+  end
+
+  cmd :all do |cfg|
+    cfg.cut_both
+  end
+
+  cfg :ssh do
+    # if user logs in to linux == has admin rights
+    if vars(:admin) == true
+      post_login do
+        cmd "sonic-cli\n"
+      end
+    end
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/eos.rb

@@ -18,7 +18,9 @@ class EOS < Oxidized::Model
     cfg.gsub! /^(enable (?:secret|password)).*/, '\\1 <configuration removed>'
     cfg.gsub! /^(service unsupported-transceiver).*/, '\\1 <license key removed>'
     cfg.gsub! /^(tacacs-server key \d+).*/, '\\1 <configuration removed>'
+    cfg.gsub! /^(radius-server .+ key \d) \S+/, '\\1 <radius secret hidden>'
     cfg.gsub! /( {6}key) (\h+ 7) (\h+).*/, '\\1 <secret hidden>'
+    cfg.gsub! /(localized|auth (md5|sha\d{0,3})|priv (des|aes\d{0,3})) \S+/, '\\1 <secret hidden>'
     cfg
   end
 

data/lib/oxidized/model/f5os.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class F5OS < Oxidized::Model
+  # F5OS Model #
+
+  comment '!'
+  prompt(/^([\w.@()-]+ ?[#>]\s+)$/)
+
+  cmd 'show running-config'
+
+  cfg :ssh do
+    post_login do
+      cmd 'paginate false'
+    end
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/firewareos.rb

@@ -1,7 +1,16 @@
 class FirewareOS < Oxidized::Model
   using Refinements
 
-  prompt /^\[?\w*\]?\w*?(<[\w-]*>)?(#|>)\s*$/
+  # matched prompts:
+  # [FAULT]WG<managed-by-wsm><master>>
+  # WG<managed-by-wsm><master>>
+  # WG<managed-by-wsm>>
+  # [FAULT]WG<non-master>>
+  # [FAULT]WG>
+  # WG>
+
+  prompt /^\[?\w*\]?\w*?(?:<[\w-]+>)*(#|>)\s*$/
+
   comment  '-- '
 
   cmd :all do |cfg|

data/lib/oxidized/model/fortios.rb

@@ -22,6 +22,8 @@ class FortiOS < Oxidized::Model
   end
 
   cmd :secret do |cfg|
+    # Remove private key for encrypted configs
+    cfg.gsub! /^(\#private-encryption-key=).+/, '\\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>'
@@ -73,10 +75,31 @@ class FortiOS < Oxidized::Model
 
     cfg << cmd('end') if @vdom_enabled
 
-    ['show | grep .', 'show full-configuration', 'show'].each do |fullcmd|
+    # Different OS have different commands - we use the first that works
+    # - For fortigate > 7 and possibly earlier versions, we use:
+    #        show | grep .                     # backup as in fortigate GUI
+    #        show full-configuration | grep .  # bakup including default values
+    #   | grep is used to avoid the --More-- prompt
+    # - It is not documented which systems need the commands without | grep:
+    #        show full-configuration
+    #        show
+    #   Document it here and make a PR on github if you know!
+    # By default, we use the configuration without default values
+    # If fullconfig: true is set in the configuration, we get the full config
+    commandlist = if vars(:fullconfig)
+                    ['show full-configuration | grep .',
+                     'show full-configuration', 'show']
+                  else
+                    ['show | grep .',
+                     'show full-configuration', 'show']
+                  end
+
+    commandlist.each do |fullcmd|
       fullcfg = cmd(fullcmd)
       next if fullcfg.lines[1..3].join =~ /(Parsing error at|command parse error)/ # Don't show for unsupported devices (e.g. FortiAnalyzer, FortiManager, FortiMail)
 
+      fullcfg.gsub! /(set comments "Error \(No order (found )?for (account )?ID \d+\) on).*/, '\\1 <stripped>"'
+
       cfg << fullcfg
       break
     end

data/lib/oxidized/model/fsos.rb

@@ -2,6 +2,7 @@ class FSOS < Oxidized::Model
   # Fiberstore / fs.com
   using Refinements
   comment '! '
+  prompt /^([\w.@()-]+[#>]\s?)$/
 
   # Handle paging
   expect /^ --More--.*$/ do |data, re|
@@ -13,6 +14,9 @@ class FSOS < Oxidized::Model
     cfg.gsub! /(secret \w+) (\S+).*/, '\\1 <secret hidden>'
     cfg.gsub! /(password \d+) (\S+).*/, '\\1 <secret hidden>'
     cfg.gsub! /(snmp-server community \d+) (\S+).*/, '\\1 <secret hidden>'
+    cfg.gsub! /^(snmp-server host \S+( udp-port \d+)?( permit|deny \d+)?( informs?)?( traps?)?(( version v3 (priv|auth|noauth))|( version (v1|v2c))?)) +\S+( .*)?$*/, '\\1 <secret hidden>'
+    cfg.gsub! /^(snmp-server user \S+ \S+ v3( priv (des|aes128|aes256|aes256-c))?( auth (md5|sha|sha256) \d+)) +\S+( .*)?$*/, '\\1 <secret hidden>'
+    cfg.gsub! /^(.*key \d+) (\S+).*/, '\\1 <secret hidden>'
     cfg
   end
 
@@ -37,7 +41,7 @@ class FSOS < Oxidized::Model
   cfg :telnet, :ssh do
     post_login 'enable'
     post_login 'terminal length 0'
-    post_login 'terminal width 256'
+    post_login 'terminal width 512'
     pre_logout 'exit'
     pre_logout 'exit'
   end

data/lib/oxidized/model/garderos.rb

@@ -0,0 +1,43 @@
+class Garderos < Oxidized::Model
+  using Refinements
+  # Garderos GmbH https://www.garderos.com/
+  # Routers for harsh environments
+  # grs = Garderos Router Software
+
+  # Remove ANSI escape codes
+  expect /\e\[[0-?]*[ -\/]*[@-~]\r?/ do |data, re|
+    data.gsub re, ''
+  end
+
+  # the prompt does not need to match escape codes, as they have been removed above
+  prompt /[\w-]+# /
+  comment '# '
+
+  cmd :all do |cfg|
+    # Remove the echo of the entered command and the prompt after it
+    cfg.cut_both
+  end
+
+  cmd 'show system version' do |cfg|
+    comment "#{cfg}\n"
+  end
+
+  cmd 'show system serial' do |cfg|
+    comment "#{cfg}\n"
+  end
+
+  # If we have a radio modem installed, we'd like to list the SIM Card
+  cmd 'show hardware wwan wwan0 sim' do |cfg|
+    if cfg.start_with? 'Unknown command'
+      String.new('')
+    else
+      comment "#{cfg}\n"
+    end
+  end
+
+  cmd 'show configuration running'
+
+  cfg :ssh do
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/h3c.rb

@@ -3,7 +3,7 @@ class H3C < Oxidized::Model
 
   # H3C
 
-  prompt /^.*(<[\w.-]+>)$/
+  prompt /^.*([<\[][\w.-]+[>\]])$/
   comment '# '
 
   cmd :secret do |cfg|

data/lib/oxidized/model/ibos.rb

@@ -22,6 +22,7 @@ class IBOS < Oxidized::Model
 
     # radius server 10.1.1.1 secret public
     cfg.gsub! /^radius server (\S+) secret (\S+)(.*)/, 'radius server \\1 secret <hidden> \\3'
+    cfg
   end
 
   cmd 'show version' do |cfg|

data/lib/oxidized/model/ios.rb

@@ -27,23 +27,29 @@ class IOS < Oxidized::Model
 
   cmd :secret do |cfg|
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
-    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! /^(snmp-server host \S+( vrf \S+)?( informs?)?( version (1|2c))?) +\S+( .*)?$*/, '\\1 <secret hidden>\\6'
     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! /^( +(?: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) .+/, '\\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.gsub! /^( +ip ospf message-digest-key \d+ md5) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +ip ospf authentication-key) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +neighbor \S+ password) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +vrrp \d+ authentication text) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +standby \d+ authentication) .{1,8}$/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +standby \d+ authentication md5 key-string) .+?( timeout \d+)?$/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^( +key-string) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^((tacacs|radius) server [^\n]+\n( +[^\n]+\n)* +key) [^\n]+$/m, '\1 <secret hidden>'
+    cfg.gsub! /^( +ppp (chap|pap) password \d) .+/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +security wpa psk set-key (?:ascii|hex) \d) (.*)$/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +dot1x username \S+ password \d) (.*)$/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +mgmtuser username \S+ password \d) (.*) (secret \d) (.*)$/, '\\1 <secret hidden> \\3 <secret hidden>'
+    cfg.gsub! /^( +client \S+ server-key \d) (.*)$/, '\\1 <secret hidden>'
+    cfg.gsub! /^( +domain-password) \S+ ?(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^( +pre-shared-key).*/, '\\1 <configuration removed>'
     cfg
   end
 
@@ -74,7 +80,7 @@ class IOS < Oxidized::Model
 
       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 =~ /(\S+(?:\sseries)?)\s+(?:\((\S+)\)\s+processor|\(revision[^)]+\)).*\s+with (\S+k) bytes/i
+      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)
@@ -118,6 +124,8 @@ class IOS < Oxidized::Model
       cfg.gsub! /^ tunnel mpls traffic-eng bandwidth[^\n]*\n*(
                     (?: [^\n]*\n*)*
                     tunnel mpls traffic-eng auto-bw)/mx, '\1'
+      # get rid of values of custom SNMP OID's
+      cfg.gsub! /^(\s+expression) \d+$/, '\\1 <value removed>'
       cfg
     end
   end

data/lib/oxidized/model/iosxr.rb

@@ -16,7 +16,7 @@ class IOSXR < Oxidized::Model
     cfg
   end
 
-  cmd 'admin show inventory' do |cfg|
+  cmd 'show inventory all' do |cfg|
     comment cfg
   end
 

data/lib/oxidized/model/junos.rb

@@ -26,7 +26,7 @@ class JunOS < Oxidized::Model
   end
 
   post do
-    out = ''
+    out = String.new('')
     case @model
     when 'mx960'
       out << cmd('show chassis fabric reachability') { |cfg| comment cfg }

data/lib/oxidized/model/kornfeldos.rb

@@ -0,0 +1,33 @@
+class KornfeldOS < Oxidized::Model
+  using Refinements
+
+  # For switches running Kornfeld OS
+  #
+  # Tested with : Kornfeld D1156 and Kornfeld D2132
+
+  comment  '# '
+
+  cmd :all do |cfg|
+    cfg.gsub! /^% Invalid input detected at '\^' marker\.$|^\s+\^$/, ''
+    cfg.each_line.to_a[2..-2].join
+  end
+
+  cmd 'show version | except REPOSITORY | except docker | except Uptime' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show platform firmware' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-configuration' do |cfg|
+    cfg.each_line.to_a[0..-1].join
+  end
+
+  cfg :ssh do
+    username /^Login:/
+    password /^Password:/
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/lenovonos.rb

@@ -42,6 +42,7 @@ class LenovoNOS < Oxidized::Model
     cfg = cfg.reject { |line| line.match /^Last boot:/ }
     cfg = cfg.reject { |line| line.match /^Temperature / }
     cfg = cfg.reject { |line| line.match /^Power Consumption/ }
+    cfg = cfg.reject { |line| line.match /^Fan/ }
 
     cfg = cfg.join
     comment_ext("=== show version ===", cfg)
@@ -63,6 +64,7 @@ class LenovoNOS < Oxidized::Model
     cfg.gsub! /^Current configuration:[^\n]*\n/, ''
     if vars(:remove_unstable_lines) == true
       cfg.gsub! /(.* password )"[0-9a-f]+"(.*)/, '\\1<unstable line hidden>\\2'
+      cfg.gsub! /(.* administrator-password )"[0-9a-f]+"(.*)/, '\\1<unstable line hidden>\\2'
       cfg.gsub! /(.*ekey )"[0-9a-f]+"(.*)/, '\\1<unstable line hidden>\\2'
     end
     cfg

data/lib/oxidized/model/linuxgeneric.rb

@@ -1,7 +1,7 @@
 class LinuxGeneric < Oxidized::Model
   using Refinements
 
-  prompt /^(\w.*|\W.*)(:|#) /
+  prompt /^(\w.*|\W.*)[:#$] /
   comment '# '
 
   # add a comment in the final conf

data/lib/oxidized/model/model.rb

@@ -184,7 +184,7 @@ module Oxidized
     end
 
     def comment(str)
-      data = ''
+      data = String.new('')
       str.each_line do |line|
         data << self.class.comment << line
       end
@@ -202,7 +202,7 @@ module Oxidized
       # Also, XML Comments must not contain --. So we put a space between
       # any double hyphens, by replacing any - that is followed by another -
       # with '- '
-      data = ''
+      data = String.new('')
       str.each_line do |_line|
         data << '<!-- ' << str.gsub(/-(?=-)/, '- ').chomp << " -->\n"
       end

data/lib/oxidized/model/netgear.rb

@@ -2,7 +2,7 @@ class Netgear < Oxidized::Model
   using Refinements
 
   comment '!'
-  prompt /^(\([\w\s\-\+.]+\)\s?[#>])$/
+  prompt /^\(?[\w \-+.]+\)? ?[#>] ?$/
 
   cmd :secret do |cfg|
     cfg.gsub!(/password (\S+)/, 'password <hidden>')

data/lib/oxidized/model/nodegrid.rb

@@ -4,7 +4,7 @@ class Nodegrid < Oxidized::Model
   # ZPE Nodegrid (Tested with Nodegrid Gate/Bold/NSR)
   # https://www.zpesystems.com/products/
 
-  prompt(%r{(?<!@)\[(.*?\s/)\]#})
+  prompt /(?<!@)\[(.*?\s\/)\]#/
   comment '# '
 
   cmd 'show system/about/' do |cfg|

data/lib/oxidized/model/nsxdfw.rb

@@ -0,0 +1,30 @@
+require 'net/http'
+class NSXDfw < Oxidized::Model
+  using Refinements
+
+  cmd "/policy/api/v1/infra/domains/" do |cfg|
+    domains = JSON.parse(cfg.encode('UTF-8', { invalid: :replace, undef: :replace, replace: '?' }))["results"]
+    domain_config = {}
+    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_config = {}
+      policies.each do |policy|
+        rules_data = cmd "/policy/api/v1/infra/domains/#{domain['id']}/security-policies/#{policy['id']}/rules"
+        rules = JSON.parse(rules_data.encode('UTF-8', { invalid: :replace, undef: :replace, replace: '?' }))["results"]
+        policies_config[policy['id']] = rules
+      end
+      domain_config[domain['id']] = policies_config
+    end
+    JSON.pretty_generate(domain_config)
+  end
+
+  cfg :http do
+    @username = @node.auth[:username]
+    @password = @node.auth[:password]
+    @headers['Content-Type'] = 'application/json'
+    @headers['Accept'] = 'application/json'
+    @secure = true
+  end
+end

data/lib/oxidized/model/nxos.rb

@@ -13,8 +13,9 @@ class NXOS < Oxidized::Model
     cfg.gsub! /^(snmp-server community).*/, '\\1 <secret hidden>'
     cfg.gsub! /^(snmp-server user (\S+) (\S+) auth (\S+)) (\S+) (priv) (\S+)/, '\\1 <secret hidden> '
     cfg.gsub! /^(snmp-server host.*? )\S+( udp-port \d+)?$/, '\\1<secret hidden>\\2'
+    cfg.gsub! /^(snmp-server mib community-map) \S+ ?(.*)/, '\\1 <secret hidden> \\2'
     cfg.gsub! /(password \d+) (\S+)/, '\\1 <secret hidden>'
-    cfg.gsub! /^(radius-server key).*/, '\\1 <secret hidden>'
+    cfg.gsub! /^(radius-server .*key(?: \d+)?) \S+/, '\\1 <secret hidden>'
     cfg.gsub! /^(tacacs-server .*key(?: \d+)?) \S+/, '\\1 <secret hidden>'
     cfg
   end

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

@@ -12,7 +12,7 @@ class RGOS < Oxidized::Model
 
   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 /^System uptime/ }.join
+    cfg = cfg.each_line.reject { |line| line.match /^\s*System uptime/ }.join
     comment "#{cfg.cut_both}\n"
   end