Dlink - fixed prompt for other dlink switches, added additional uptim…

…e removal expressions (#2794)
ytti · Jul 25, 2023 · fd3608e · fd3608e
1 parent dab52d0
commit fd3608e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 + Documentation to send mail with hooks
 
 ## Changed
+- dlink: fixed prompt for other dlink switches, added additional uptime removal expressions (@mirackle-spb)
 
 ## Fixed
 

diff --git a/lib/oxidized/model/dlink.rb b/lib/oxidized/model/dlink.rb
@@ -2,9 +2,8 @@ class Dlink < Oxidized::Model
   using Refinements
 
   # D-LINK Switches
-  # Add support dgs 1100 series (tested only with dgs-1100-10/me)
 
-  prompt /^(\r*[\w\s.@()\/:-]+[#>]\s?)$/
+  prompt /[\w.@()\/:-]+[#>]\s?$/
   comment '# '
 
   cmd :secret do |cfg|
@@ -19,6 +18,9 @@ class Dlink < Oxidized::Model
 
   cmd 'show switch' do |cfg|
     cfg.gsub! /^System Uptime\s.+/, '' # Omit constantly changing uptime info
+    cfg.gsub! /^System up time\s.+/, '' # Omit constantly changing uptime info
+    cfg.gsub! /^System Time\s.+/, '' # Omit constantly changing uptime info
+    cfg.gsub! /^RTC Time\s.+/, '' # Omit constantly changing uptime info
     comment cfg
   end