Merge branch 'master' into ssh-auth-methods

3 files changed, 29 insertions, 2 deletions

diff --git a/lib/oxidized/model/arbos.rb b/lib/oxidized/model/arbos.rb
new file mode 100644
index 0000000..389f3f6
--- /dev/null
+++ b/lib/oxidized/model/arbos.rb
@@ -0,0 +1,27 @@
+class ARBOS  < Oxidized::Model
+
+  # Arbor OS model #
+
+  prompt /^[\S\s]+\n([\w.@-]+[:\/#>]+)\s?$/
+  comment  '# '
+
+  cmd 'system hardware' do |cfg|
+    cfg.gsub! /^Boot\ time\:\s.+/, '' # Remove boot timer
+    cfg.gsub! /^Load\ averages\:\s.+/, '' # Remove CPU load info
+    cfg = cfg.each_line.to_a[2..-1].join
+    comment cfg
+  end
+
+  cmd 'system version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'config show' do |cfg|
+    cfg
+  end
+
+  cfg :ssh do
+    exec true
+    pre_logout 'exit'
+  end
+end
diff --git a/lib/oxidized/model/edgeos.rb b/lib/oxidized/model/edgeos.rb
index 2a8d663..bb0aab5 100644
--- a/lib/oxidized/model/edgeos.rb
+++ b/lib/oxidized/model/edgeos.rb
@@ -13,7 +13,7 @@ class Edgeos < Oxidized::Model
     cfg
   end
 
-  cmd 'show configuration | no-more'
+  cmd 'show configuration commands | no-more'
 
   cfg :telnet do
     username  /login:\s/
diff --git a/lib/oxidized/model/vyatta.rb b/lib/oxidized/model/vyatta.rb
index 8d977aa..aa0bc74 100644
--- a/lib/oxidized/model/vyatta.rb
+++ b/lib/oxidized/model/vyatta.rb
@@ -13,7 +13,7 @@ class Vyatta < Oxidized::Model
     cfg
   end
 
-  cmd 'show configuration | no-more'
+  cmd 'show configuration commands | no-more'
 
   cfg :telnet do
     username  /login:\s/