4 files changed, 105 insertions, 3 deletions
diff --git a/lib/oxidized/model/c4cmts.rb b/lib/oxidized/model/c4cmts.rb
new file mode 100644
index 0000000..150029c
--- /dev/null
+++ b/lib/oxidized/model/c4cmts.rb
@@ -0,0 +1,52 @@
+class C4CMTS < Oxidized::Model
+
+  # Arris C4 CMTS
+
+  prompt /^([\w.@:\/-]+[#>]\s?)$/
+  comment  '! '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
+  end
+
+  cmd :secret do |cfg| 
+    cfg.gsub! /(.+)\s+encrypted-password\s+\w+\s+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /(snmp-server community)\s+".*"\s+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /(tacacs.*\s+key)\s+".*"\s+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /(cable authstring)\s+\w+\s+(.*)/, '\\1 <secret hidden> \\2'
+    cfg
+  end
+
+  cmd 'show environment' do |cfg|
+    cfg.gsub! /\s+[\-\d]+\s+C\s+[\(\s\d]+\s+\F\)/, ''	# remove temperature readings
+    cfg.each_line.to_a[1..-2].join
+    comment cfg
+  end
+
+  cmd 'show version' do |cfg|
+    # remove uptime readings at char 55 and beyond
+    cfg = cfg.each_line.map{|line|line.rstrip.slice(0..54)}.join("\n") + "\n"
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg = cfg.each_line.to_a[1..-2].join
+    cfg
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    if vars :enable
+      post_login do
+        send "enable\n"
+        send vars(:enable) + "\n"
+      end
+    end
+    pre_logout 'exit'
+  end
+
+end
diff --git a/lib/oxidized/model/comware.rb b/lib/oxidized/model/comware.rb
index aa98ccb..9b36e8b 100644
--- a/lib/oxidized/model/comware.rb
+++ b/lib/oxidized/model/comware.rb
@@ -1,7 +1,8 @@
 class Comware < Oxidized::Model
   # HP (A-series)/H3C/3Com Comware
   
-  prompt /^(<[\w.-]+>)$/
+  # sometimes the prompt might have a leading nul
+  prompt /^\0*(<[\w.-]+>)$/
   comment '# '
 
   # example how to handle pager
diff --git a/lib/oxidized/model/dnos.rb b/lib/oxidized/model/dnos.rb
new file mode 100644
index 0000000..1c31aad
--- /dev/null
+++ b/lib/oxidized/model/dnos.rb
@@ -0,0 +1,47 @@
+class DNOS  < Oxidized::Model
+
+  # Force10 DNOS model #
+
+  comment  '! '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[2..-2].join
+  end
+
+  cmd :secret do |cfg| 
+    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    cfg.gsub! /secret (\d+) (\S+).*/, '<secret hidden>'
+    cfg
+  end
+
+  cmd 'show inventory' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show inventory media' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg = cfg.each_line.to_a[3..-1].join
+    cfg
+  end
+
+  cfg :telnet do
+    username /^Login:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'terminal length 0'
+    post_login 'terminal width 0'
+    if vars :enable
+      post_login do
+        send "enable\n"
+        send vars(:enable) + "\n"
+      end
+    end
+    pre_logout 'exit'
+  end
+
+end
diff --git a/lib/oxidized/model/ironware.rb b/lib/oxidized/model/ironware.rb
index 2975651..87a51a6 100644
--- a/lib/oxidized/model/ironware.rb
+++ b/lib/oxidized/model/ironware.rb
@@ -16,7 +16,9 @@ class IronWare < Oxidized::Model
   #end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    # sometimes ironware inserts arbitrary whitespace after commands are
+    # issued on the CLI, from run to run.  this normalises the output.
+    cfg.each_line.to_a[1..-2].drop_while { |e| e.match /^\s+$/ }.join
   end
 
   cmd 'show version' do |cfg|
@@ -56,7 +58,7 @@ class IronWare < Oxidized::Model
 
   cmd 'show running-config' do |cfg|
     arr = cfg.each_line.to_a
-    arr[3..-1].join unless arr.length < 3
+    arr[2..-1].join unless arr.length < 2
   end
 
   cfg :telnet do