oxidized 0.30.1 → 0.31.0

data/examples/podman-compose/docker-compose.yml

@@ -1,8 +1,10 @@
 services:
   oxidized:
     # Choose the image that you want to test
-    # image: docker.io/oxidized/oxidized:0.29.1
-    image: docker.io/oxidized/oxidized:latest
+    # image: docker.io/oxidized/oxidized:0.30.1
+    # image: docker.io/oxidized/oxidized:latest
+    # local/oxidized is build by "make oxidized-image" and "make run"
+    image: local/oxidized
     ports:
       - 127.0.0.1:8042:8888/tcp
     environment:
@@ -13,9 +15,16 @@ services:
     volumes:
        - ./oxidized-config:/home/oxidized/.config/oxidized
        - ./oxidized-ssh:/home/oxidized/.ssh
+
   # This is a simulated network device for the example to work out of the box
   asternos-device:
     image: localhost/local/model
     volumes:
       - ./model-simulation/asternos.sh:/home/oxidized/.profile
       - ./model-simulation/asternos.sh:/home/admin/.profile
+
+  # This is a gitserver to push our configs
+  gitserver:
+    image: localhost/local/gitserver
+    volumes:
+      - ./gitserver/repo.git:/home/git/repo.git

data/examples/podman-compose/gitserver/.gitignore

@@ -0,0 +1 @@
+repo.git

data/examples/podman-compose/gitserver/Dockerfile

@@ -0,0 +1,14 @@
+FROM docker.io/phusion/baseimage:noble-1.0.0
+
+# Use baseimage-docker's init system.
+CMD ["/sbin/my_init"]
+
+# enable ssh
+RUN rm -f /etc/service/sshd/down
+RUN /etc/my_init.d/00_regen_ssh_host_keys.sh
+
+# Add user for the gitserver. The password is "git"
+RUN useradd -m git -p '$6$32WDb0LTFyQkLffy$u15COVx7CQ4tgp4JT4DO4LJ96q/jwFSpuZC3WrllNQDNa6nW1LhJKW9rLV57ak3rj9Ln./aRA85jzeof1B0Gi1' -s /bin/bash -u 30001
+
+# And install git
+RUN install_clean git

data/examples/podman-compose/model-simulation/Dockerfile-model

@@ -1,4 +1,4 @@
-FROM docker.io/phusion/baseimage:jammy-1.0.2
+FROM docker.io/phusion/baseimage:noble-1.0.0
 
 # Use baseimage-docker's init system.
 CMD ["/sbin/my_init"]

data/examples/podman-compose/model-simulation/asternos.sh

@@ -16,6 +16,8 @@ EOF
 function show() {
   if [ "$*" == "version" ]; then
     echo "Version 1.2.3"
+    # Make the output change over time
+    date
   elif [ "$*" == "runningconfiguration all" ]; then
           cat << EOF
 ! begin of the configuration

data/examples/podman-compose/oxidized-config/.gitignore

@@ -3,6 +3,8 @@ config.local
 router.db.local
 
 # Ignore logs, retrieved configs...
+pid
 configs/
 crash
 logs/
+oxidized.git/

data/examples/podman-compose/oxidized-config/config

@@ -10,7 +10,7 @@ use_max_threads: true
 timeout: 20
 retries: 3
 prompt: !ruby/regexp /^([\w.@-]+[#>]\s?)$/
-rest: 127.0.0.1:8888
+rest: 0.0.0.0:8888
 next_adds_job: false
 vars: {}
 groups: {}

data/examples/podman-compose/oxidized-config/config_csv-file

@@ -0,0 +1,46 @@
+---
+username: oxidized
+password: oxidized
+resolve_dns: true
+interval: 3600
+use_syslog: false
+debug: false
+threads: 30
+use_max_threads: true
+timeout: 20
+retries: 3
+prompt: !ruby/regexp /^([\w.@-]+[#>]\s?)$/
+rest: 0.0.0.0:8888
+next_adds_job: false
+vars: {}
+groups: {}
+group_map: {}
+models: {}
+pid: "~/.config/oxidized/pid"
+crash:
+  directory: "~/.config/oxidized/crashes"
+  hostnames: false
+stats:
+  history_size: 10
+input:
+  default: ssh
+  debug: false
+  ssh:
+    secure: false
+  ftp:
+    passive: true
+  utf8_encoded: true
+output:
+  default: file
+  file:
+    directory: "~/.config/oxidized/configs/"
+source:
+  default: csv
+  csv:
+    file: "~/.config/oxidized/router.db"
+    delimiter: !ruby/regexp /:/
+    map:
+      name: 0
+      model: 1
+      ip: 2
+    gpg: false

data/examples/podman-compose/oxidized-config/config_csv-gitserver

@@ -0,0 +1,56 @@
+---
+username: oxidized
+password: oxidized
+resolve_dns: true
+interval: 3600
+use_syslog: false
+debug: false
+threads: 30
+use_max_threads: true
+timeout: 20
+retries: 3
+prompt: !ruby/regexp /^([\w.@-]+[#>]\s?)$/
+rest: 0.0.0.0:8888
+next_adds_job: false
+vars: {}
+groups: {}
+group_map: {}
+models: {}
+pid: "~/.config/oxidized/pid"
+crash:
+  directory: "~/.config/oxidized/crashes"
+  hostnames: false
+stats:
+  history_size: 10
+input:
+  default: ssh
+  debug: false
+  ssh:
+    secure: false
+  ftp:
+    passive: true
+  utf8_encoded: true
+output:
+  default: git
+  git:
+    user: Oxidized
+    email: o@example.com
+    repo: "~/.config/oxidized/oxidized.git"
+source:
+  default: csv
+  csv:
+    file: "~/.config/oxidized/router.db"
+    delimiter: !ruby/regexp /:/
+    map:
+      name: 0
+      model: 1
+      ip: 2
+    gpg: false
+hooks:
+  push_to_remote:
+    type: githubrepo
+    events:
+    - post_store
+    remote_repo: git@gitserver:repo.git
+    username: git
+    password: git

data/examples/podman-compose/oxidized-ssh/.gitignore

@@ -0,0 +1 @@
+known_hosts

data/lib/oxidized/config.rb

@@ -17,6 +17,8 @@ module Oxidized
     def self.load(cmd_opts = {})
       usrdir = File.expand_path(cmd_opts[:home_dir] || Oxidized::Config::ROOT)
       cfgfile = cmd_opts[:config_file] || 'config'
+      # configuration file with full path as a class instance variable
+      @configfile = File.join(usrdir, cfgfile)
       asetus = Asetus.new(name: 'oxidized', load: false, key_to_s: true, usrdir: usrdir, cfgfile: cfgfile)
       Oxidized.asetus = asetus
 
@@ -65,13 +67,17 @@ module Oxidized
         raise InvalidConfig, "Error loading config: #{e.message}"
       end
 
-      raise NoConfig, 'edit ~/.config/oxidized/config' if asetus.create
+      raise NoConfig, "edit #{@configfile}" if asetus.create
 
       # override if comand line flag given
       asetus.cfg.debug = cmd_opts[:debug] if cmd_opts[:debug]
 
       asetus
     end
+
+    class << self
+      attr_reader :configfile
+    end
   end
 
   class << self

data/lib/oxidized/hook/githubrepo.rb

@@ -1,15 +1,21 @@
+require 'rugged'
+
 class GithubRepo < Oxidized::Hook
   def validate_cfg!
     raise KeyError, 'hook.remote_repo is required' unless cfg.has_key?('remote_repo')
   end
 
   def run_hook(ctx)
+    unless ctx.node.repo
+      log "Oxidized output is not git, can't push to remote", :error
+      return
+    end
     repo  = Rugged::Repository.new(ctx.node.repo)
     creds = credentials(ctx.node)
     url   = remote_repo(ctx.node)
 
     if url.nil? || url.empty?
-      log "No repository defined for #{ctx.node.group}/#{ctx.node.name}", :debug
+      log "No repository defined for #{ctx.node.group}/#{ctx.node.name}", :error
       return
     end
 
@@ -23,21 +29,39 @@ class GithubRepo < Oxidized::Hook
     end
     remote = repo.remotes['origin']
 
-    fetch_and_merge_remote(repo, creds)
-
-    remote.push([repo.head.name], credentials: creds)
+    begin
+      fetch_and_merge_remote(repo, creds)
+      remote.push([repo.head.name], credentials: creds)
+    rescue Rugged::NetworkError => e
+      if e.message == 'unsupported URL protocol'
+        log "Rugged does not support the git URL '#{url}'.", :warn
+        unless Rugged.features.include?(:ssh)
+          log 'You may need to install Rugged with ssh support ' \
+              '(gem install rugged -- --with-ssh)', :warn
+        end
+      end
+      # re-raise exception for the calling method
+      raise
+    end
   end
 
   def fetch_and_merge_remote(repo, creds)
     result = repo.fetch('origin', [repo.head.name], credentials: creds)
     log result.inspect, :debug
 
-    unless result[:total_deltas].positive?
-      log "nothing received after fetch", :debug
+    their_branch = remote_branch(repo)
+
+    unless their_branch
+      log 'remote branch does not exist yet, nothing to merge', :debug
       return
     end
 
-    their_branch = repo.branches["origin/master"]
+    result = repo.merge_analysis(their_branch.target_id)
+
+    if result.include? :up_to_date
+      log 'nothing to merge', :debug
+      return
+    end
 
     log "merging fetched branch #{their_branch.name}", :debug
 
@@ -97,4 +121,10 @@ class GithubRepo < Oxidized::Hook
       cfg.remote_repo[node.group].url
     end
   end
+
+  # Returns a Rugged::Branch to the remote branch or nil if it doen't exist
+  def remote_branch(repo)
+    head_branch = repo.branches[repo.head.name]
+    repo.branches['origin/' + head_branch.name]
+  end
 end

data/lib/oxidized/hook/slackdiff.rb

@@ -1,4 +1,6 @@
-require 'slack'
+require 'slack_ruby_client'
+require 'uri'
+require 'net/http'
 
 # defaults to posting a diff, if messageformat is supplied them a message will be posted too
 # diff defaults to true
@@ -9,6 +11,30 @@ class SlackDiff < Oxidized::Hook
     raise KeyError, 'hook.channel is required' unless cfg.has_key?('channel')
   end
 
+  def slack_upload(client, title, content, channel)
+    log "Posting diff as snippet to #{channel}"
+    upload_dest = client.files_getUploadURLExternal(filename:     "change",
+                                                    length:       content.length,
+                                                    snippet_type: "diff")
+    file_uri = URI.parse(upload_dest[:upload_url])
+
+    http = Net::HTTP.new(file_uri.host, file_uri.port)
+    http.use_ssl = true
+
+    request = Net::HTTP::Post.new(file_uri.request_uri, { Host: file_uri.host })
+    request.body = content
+    response = http.request(request)
+
+    raise 'Slack file upload failed' unless response.is_a? Net::HTTPSuccess
+
+    files = [{
+      id:    upload_dest[:file_id],
+      title: title
+    }]
+    client.files_completeUploadExternal(channel_id: channel,
+                                        files:      files.to_json)
+  end
+
   def run_hook(ctx)
     return unless ctx.node
     return unless ctx.event.to_s == "post_store"
@@ -26,12 +52,8 @@ class SlackDiff < Oxidized::Hook
       diff = gitoutput.get_diff ctx.node, ctx.node.group, ctx.commitref, nil
       unless diff == "no diffs"
         title = "#{ctx.node.name} #{ctx.node.group} #{ctx.node.model.class.name.to_s.downcase}"
-        log "Posting diff as snippet to #{cfg.channel}"
-        client.files_upload(channels: cfg.channel, as_user: true,
-                            content: diff[:patch].lines.to_a[4..-1].join,
-                            filetype: "diff",
-                            title: title,
-                            filename: "change")
+        content = diff[:patch].lines.to_a[4..-1].join
+        slack_upload(client, title, content, cfg.channel)
       end
     end
     # message custom formatted - optional

data/lib/oxidized/input/http.rb

@@ -2,6 +2,7 @@ module Oxidized
   require "oxidized/input/cli"
   require "net/http"
   require "json"
+  require "net/http/digest_auth"
 
   class HTTP < Input
     include Input::CLI

data/lib/oxidized/input/telnet.rb

@@ -63,7 +63,7 @@ module Oxidized
     def disconnect
       disconnect_cli
       @telnet.close
-    rescue Errno::ECONNRESET
+    rescue Errno::ECONNRESET, IOError
       # This exception is intented and therefore not handled here
     ensure
       @log.close if Oxidized.config.input.debug?

data/lib/oxidized/manager.rb

@@ -5,15 +5,16 @@ module Oxidized
   require 'oxidized/source/source'
   class Manager
     class << self
-      def load(dir, file)
+      def load(dir, file, namespace)
         require File.join dir, file + '.rb'
-        klass = nil
-        [Oxidized, Object].each do |mod|
-          klass   = mod.constants.find { |const| const.to_s.casecmp(file).zero? }
-          klass ||= mod.constants.find { |const| const.to_s.downcase == 'oxidized' + file.downcase }
-          klass   = mod.const_get klass if klass
-          break if klass
-        end
+
+        # Search the object to load in namespace
+        klass = namespace.constants.find { |const| const.to_s.casecmp(file).zero? }
+
+        return false unless klass
+
+        klass = namespace.const_get klass
+
         i = klass.new
         i.setup if i.respond_to? :setup
         { file => klass }
@@ -33,32 +34,32 @@ module Oxidized
     end
 
     def add_input(name)
-      loader @input, Config::INPUT_DIR, "input", name
+      loader @input, Config::INPUT_DIR, "input", name, Oxidized
     end
 
     def add_output(name)
-      loader @output, Config::OUTPUT_DIR, "output", name
+      loader @output, Config::OUTPUT_DIR, "output", name, Oxidized::Output
     end
 
     def add_source(name)
-      loader @source, Config::SOURCE_DIR, "source", name
+      loader @source, Config::SOURCE_DIR, "source", name, Oxidized::Source
     end
 
     def add_model(name)
-      loader @model, Config::MODEL_DIR, "model", name
+      loader @model, Config::MODEL_DIR, "model", name, Object
     end
 
     def add_hook(name)
-      loader @hook, Config::HOOK_DIR, "hook", name
+      loader @hook, Config::HOOK_DIR, "hook", name, Object
     end
 
     private
 
     # if local version of file exists, load it, else load global - return falsy value if nothing loaded
-    def loader(hash, global_dir, local_dir, name)
+    def loader(hash, global_dir, local_dir, name, namespace)
       dir   = File.join(Config::ROOT, local_dir)
-      map   = Manager.load(dir, name) if File.exist? File.join(dir, name + ".rb")
-      map ||= Manager.load(global_dir, name)
+      map   = Manager.load(dir, name, namespace) if File.exist? File.join(dir, name + ".rb")
+      map ||= Manager.load(global_dir, name, namespace)
       hash.merge!(map) if map
     end
   end

data/lib/oxidized/model/aoscx.rb

@@ -56,9 +56,23 @@ class Aoscx < Oxidized::Model
   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! /^(\d+\/?\S+\s+\S+\s+)\d+\.\d+\s+C\s+(.*)/, '\\1<hidden>   \\2'
     cfg.gsub! /^(LC.*\s+)\d+\.\d+\s+(C.*)$/, '\\1 <hidden> \\2'
-    cfg.gsub! /^(\S+\s+\S+\s+\s+\S+\s+)(slow|normal|medium|fast|max)(\s+\S+\s+\S+\s+)\d+/, '\\1<speed>\\3<rpm>'
+    cfg.gsub! /^(\S+\s+\S+\s+\s+\S+\s+)(slow|normal|medium|fast|max)\s+(\S+\s+\S+\s+)\d+[[:blank:]]+/, '\\1<speed> \\3<rpm>'
+    # match show environment power-consumption on VSF or standadlone, non-chassis and non-6400 switch, e.g. "2    6300M 48G 4SFP56 Swch                 156.00      155.94"
+    cfg.gsub! /^(\d+\s+.+\s+)(\s{2}\d{2}\.\d{2}|\s{1}\d{3}\.\d{2}|\d{4}\.\d{2})(\s+)(\s{2}\d{2}\.\d{2}|\s{1}\d{3}\.\d{2}|\d{4}\.\d{2})$/, '\\1<power>\\3<power>'
+    # match show environment power-consumption on 6400 or chassis switches, e.g. "1/4    line-card-module    R0X39A 6400 48p 1GbE CL4 PoE 4SFP56 Mod     54 W"
+    cfg.gsub! /^(\d+\/?\d*\s+.+\s+)(\s{1,4}\d{1,3})\sW\s*$/, '\\1<power>'
+    # match show environment power-consumption on 6400 or chassis switches, e.g. "Module Total Power Usage      13000 W", match up to a 5-digit number and keep table formatting.
+    cfg.gsub! /^(Module|Chassis)\s(Total\sPower\sUsage)(\s+)\s(\s{4}\d{1}|\s{3}\d{2}|\s{2}\d{3}|\s{1}\d{4}|\d{5})\sW\s*$/, '\\1 <power>'
+    # match show environment power-consumption on 6400 or chassis switches, e.g. "Chassis Total Power Usage     13000 W", match up to a 5-digit number and keep table formatting.
+    cfg.gsub! /^(Chassis\sTotal\sPower\sUsage)(\s+)(\s{4}\d{1}|\s{3}\d{2}|\s{2}\d{3}|\s{1}\d{4}|\d{5})\sW\s*$/, '\\1\\2<power>'
+    # match show environment power-consumption on 8400 or chassis switches, up to a 5-digit number, example matches:
+    # e.g. "Chassis Total Power Allocated (total of all max wattages)               4130 W"
+    # e.g. "Chassis Total Power Unallocated                                        15860 W"
+    cfg.gsub! /^(Chassis\sTotal\sPower\s)(Allocated|Unallocated)(\s|\s\(total of all max wattages\))(\s+)(\s{4}\d{1}|\s{3}\d{2}|\s{2}\d{3}|\s{1}\d{4}|\d{5})\sW\s*$/, '\\1\\2\\3\\4<power>'
+    # match Total Power Consumption:
+    cfg.gsub! /^([t|T]otal\s[p|P]ower\s[c|C]onsumption\s+)(\d+\.\d\d)$/, '\\1<power>'
     comment cfg
   end
 

data/lib/oxidized/model/aosw.rb

@@ -12,7 +12,13 @@ class AOSW < Oxidized::Model
   # All IAPs connected to a Instant Controller will have the same config output. Only the controller needs to be monitored.
 
   comment '# '
-  prompt /^([\w\(:.@-]+(\)?\s?)[#>]\s?)$/
+  # see /spec/model/aosw_spec.rb for prompt examples
+  prompt /^\(?[\w\:.@-]+\)? ?[*^]?(\[[\w\/]+\] ?)?[#>] ?$/
+
+  # Ignore cariage returns - also for the prompt
+  expect "\r" do |data, re|
+    data.gsub re, ''
+  end
 
   cmd :all do |cfg|
     cfg.cut_both

data/lib/oxidized/model/arubainstant.rb

@@ -0,0 +1,90 @@
+class ArubaInstant < Oxidized::Model
+  using Refinements
+
+  # Aruba IAP, Instant Controller
+
+  comment '# '
+  prompt(/^[\w\:.@-]+[#>] $/)
+
+  cmd :all do |cfg|
+    # Remove command echo and prompt
+    cfg.cut_both
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub!(/ipsec (\S+)$/, 'ipsec <secret removed>')
+    cfg.gsub!(/community (\S+)$/, 'community <secret removed>')
+    cfg.gsub!(/^(snmp-server host [\d.]+ version 2c) \S+ (.*)$/, '\1 <secret removed> \2')
+    # MAS format: mgmt-user <username> <accesslevel> <password hash>
+    # IAP format (root user): mgmt-user <username> <password hash>
+    # IAP format: mgmt-user <username> <password hash> <access level>
+    cfg.gsub!(/mgmt-user (\S+) (root|guest-provisioning|network-operations|read-only|location-api-mgmt) (\S+)$/, 'mgmt-user \1 \2 <secret removed>') # MAS & Wireless Controler
+    cfg.gsub!(/mgmt-user (\S+) (\S+)( (read-only|guest-mgmt))?$/, 'mgmt-user \1 <secret removed> \3') # IAP
+    cfg.gsub!(/key (\S+)$/, 'key <secret removed>')
+    cfg.gsub!(/wpa-passphrase (\S+)$/, 'wpa-passphrase <secret removed>')
+    cfg.gsub!(/bkup-passwords (\S+)$/, 'bkup-passwords <secret removed>')
+    cfg.gsub!(/user (\S+) (\S+) (\S+)$/, 'user \1 <secret removed> \3')
+    cfg.gsub!(/virtual-controller-key (\S+)$/, 'virtual-controller-key <secret removed>')
+    cfg.gsub!(/^(hash-mgmt-user .* password \S+) \S+( usertype .*)?$/, '\1 <secret removed>\2')
+    cfg
+  end
+
+  # get software version
+  cmd 'show version' do |cfg|
+    out = ''
+    cfg.each_line do |line|
+      next if line =~ /^(Switch|AP) uptime is /
+
+      next if line =~ /^Reboot Time and Cause/
+
+      out += line
+    end
+    comment out
+  end
+
+  # Get serial number
+  cmd 'show activate status' do |cfg|
+    out = ''
+    cfg.each_line do |line|
+      next if line =~ /^Activate /
+
+      next if line =~ /^Provision interval/
+
+      next if line =~ /^Cloud Activation Key/
+
+      out += line
+    end
+    comment out + "\n"
+  end
+
+  # Get controlled WLAN-AP
+  cmd 'show aps' do |cfg|
+    out = ''
+    cfg.each_line do |line|
+      out += if line.match?(/^Name/)
+               line.sub(/^(Name +IP Address +).*(Type +IPv6 Address +).*(Serial #).*$/, '\1\2\3')
+             else
+               line.sub(/^(\S+ +\S+ +)(?:\S+ +){3}(\S+ +\S+ +)(?:\S+ +){2}(\S+) +.*$/, '\1\2\3')
+             end
+    end
+    comment out + "\n"
+  end
+
+  cmd 'show running-config no-encrypt'
+
+  cfg :telnet do
+    username(/^User:\s*/)
+    password(/^Password:\s*/)
+  end
+
+  cfg :telnet, :ssh do
+    if vars :enable
+      post_login do
+        cmd "enable", /^[pP]assword:/
+        cmd vars(:enable)
+      end
+    end
+    pre_logout 'exit' if vars :enable
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/audiocodes.rb

@@ -12,14 +12,14 @@ class AudioCodes < Oxidized::Model
     data.sub re, ''
   end
 
-  cmd 'show running-config' do |cfg|
+  cmd "show running-config\r\n" do |cfg|
     cfg
   end
 
   cfg :ssh do
     username /^login as:\s$/
     password /^.+password:\s$/
-    pre_logout 'exit'
+    pre_logout "exit\r\n"
   end
 
   cfg :telnet do

data/lib/oxidized/model/cnos.rb

@@ -4,18 +4,20 @@ class CNOS < Oxidized::Model
 
   comment '! '
 
-  cmd :all do |cfg|
-    cfg.each_line.to_a[0..-2].join
+  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 running-config' do |cfg|
-    cfg.gsub!(/(snmp-server community )(\S+)/, '\1<hidden>')
-    cfg.gsub!(/key type private.+key string end/m, '<private key hidden>')
-    cfg
+  cmd :all do |cfg|
+    cfg = cfg.delete("\r")
+    cfg.cut_both
   end
 
   cmd 'show version' do |cfg|
-    cfg.gsub! /^(.* uptime is ).*\n/, '\1'
+    cfg = cfg.each_line.reject { |line| line.match /\ uptime\ is\ / }.join
     comment cfg
   end
 
@@ -23,9 +25,10 @@ class CNOS < Oxidized::Model
     comment cfg
   end
 
-  cfg :telnet do
-    username /^Username:/
-    password /^Password:/
+  cmd 'show running-config' do |cfg|
+    # remove empty lines
+    cfg = cfg.each_line.reject { |line| line.match /^[\r\n\s\u0000#]+$/ }.join
+    cfg
   end
 
   cfg :telnet, :ssh do

data/lib/oxidized/model/cumulus.rb

@@ -21,9 +21,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'

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