From ed7c5574a197605658dfc5c8d5563d55e483eef3 Mon Sep 17 00:00:00 2001
From: Arnoud Vermeer <a.vermeer@tech.leaseweb.com>
Date: Mon, 22 Aug 2016 15:22:30 +0200
Subject: Remove secrets from A10 config and 'show running-config' doesn't have
 'all-partitions' in 64-bit Advanced Core OS (ACOS) version 4.1.0-P4, build 12
 (Jul-22-2016,15:49)

---
 lib/oxidized/model/acos.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/acos.rb b/lib/oxidized/model/acos.rb
index bb9846e..f4d4464 100644
--- a/lib/oxidized/model/acos.rb
+++ b/lib/oxidized/model/acos.rb
@@ -6,6 +6,13 @@ class ACOS < Oxidized::Model
   ##ACOS prompt changes depending on the state of the device
   prompt /^([-\w.\/:?\[\]\(\)]+[#>]\s?)$/
 
+  cmd :secret do |cfg|
+    cfg.gsub!(/community read encrypted (\S+)/, 'community read encrypted <hidden>') # snmp
+    cfg.gsub!(/secret encrypted (\S+)/, 'secret encrypted <hidden>') # tacacs-server
+    cfg.gsub!(/password encrypted (\S+)/, 'password encrypted <hidden>') # user
+    cfg
+  end
+
   cmd 'show version' do |cfg|
     cfg.gsub! /\s(Last configuration saved at).*/, ' \\1 <removed>'
     cfg.gsub! /\s(Memory).*/, ' \\1 <removed>'
@@ -22,7 +29,7 @@ class ACOS < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show running-config all-partitions' do |cfg|
+  cmd 'show running-config' do |cfg|
      cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
      cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
      cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
-- 
cgit v1.2.1


From 2c4ac17756320fa4abba2eee9ad32badb15043c7 Mon Sep 17 00:00:00 2001
From: Arnoud Vermeer <a.vermeer@tech.leaseweb.com>
Date: Mon, 22 Aug 2016 15:23:59 +0200
Subject: Cisco Adaptive Security Appliance Software Version 9.4(2)6 reports
 TACACS config like this:

aaa-server tacacs (OUTSIDE) host 192.168.1.1
 key assadasda

Updated the regex to be backward compatible.
---
 lib/oxidized/model/asa.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/asa.rb b/lib/oxidized/model/asa.rb
index a41348e..df30059 100644
--- a/lib/oxidized/model/asa.rb
+++ b/lib/oxidized/model/asa.rb
@@ -15,7 +15,7 @@ class ASA < Oxidized::Model
     cfg.gsub! /username (\S+) password (\S+) (.*)/, 'username \1 password <secret hidden> \3'
     cfg.gsub! /ikev2 pre-shared-key (\S+)/, 'ikev2 pre-shared-key <secret hidden>'
     cfg.gsub! /ikev2 (remote|local)-authentication pre-shared-key (\S+)/, 'ikev2 \1-authentication pre-shared-key <secret hidden>'
-    cfg.gsub! /^(aaa-server TACACS\+ \(\S+\) host.*\n\skey) \S+$/m, '\1 <secret hidden>'
+    cfg.gsub! /^(aaa-server TACACS\+? \(\S+\) host.*\n\skey) \S+$/mi, '\1 <secret hidden>'
     cfg
   end
 
-- 
cgit v1.2.1


From fef6b89aaeb44ab2b0601ee8a8924f20958cf507 Mon Sep 17 00:00:00 2001
From: Arnoud Vermeer <a.vermeer@tech.leaseweb.com>
Date: Mon, 22 Aug 2016 15:30:40 +0200
Subject: It's not outputting config

---
 lib/oxidized/model/acos.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/acos.rb b/lib/oxidized/model/acos.rb
index f4d4464..6b5bc41 100644
--- a/lib/oxidized/model/acos.rb
+++ b/lib/oxidized/model/acos.rb
@@ -34,6 +34,7 @@ class ACOS < Oxidized::Model
      cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
      cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
      cfg.gsub! /(Configuration last synchronized at).*/, '\\1 <removed>'
+     cfg
   end
 
   cmd 'show aflex all-partitions' do |cfg|
-- 
cgit v1.2.1


From 530db63d0f385bccab5efbfcbf24011aa2925e3c Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Tue, 23 Aug 2016 13:13:13 +0300
Subject: Closes #535

---
 lib/oxidized/model/pfsense.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/pfsense.rb b/lib/oxidized/model/pfsense.rb
index cd6885c..8cb0118 100644
--- a/lib/oxidized/model/pfsense.rb
+++ b/lib/oxidized/model/pfsense.rb
@@ -1,4 +1,6 @@
 class PfSense < Oxidized::Model
+
+  # use other use than 'admin' user, 'admin' user cannot get ssh/exec. See issue #535
   
   comment  '# '
   
-- 
cgit v1.2.1


From 0c925a7e8e3ff2b8b1f8b69443032a37c7f8dbcc Mon Sep 17 00:00:00 2001
From: Arnoud Vermeer <a.vermeer@tech.leaseweb.com>
Date: Tue, 23 Aug 2016 13:38:07 +0200
Subject: !Current config commit point for partition 0 is 0 & config mode is
 classical-mode ! COMMAND: show running-config all-partitions                 
                                               ^ % Unrecognized
 command.Invalid input detected at '^' marker.

---
 lib/oxidized/model/acos.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/acos.rb b/lib/oxidized/model/acos.rb
index 6b5bc41..ec78711 100644
--- a/lib/oxidized/model/acos.rb
+++ b/lib/oxidized/model/acos.rb
@@ -37,6 +37,14 @@ class ACOS < Oxidized::Model
      cfg
   end
 
+  cmd 'show running-config all-partitions' do |cfg|
+     cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last synchronized at).*/, '\\1 <removed>'
+     cfg
+  end
+
   cmd 'show aflex all-partitions' do |cfg|
     comment cfg
   end
-- 
cgit v1.2.1


From 233a360e0f975cf9f04a70d5fbbce0e6945967f9 Mon Sep 17 00:00:00 2001
From: Arnoud Vermeer <a.vermeer@tech.leaseweb.com>
Date: Tue, 23 Aug 2016 16:37:32 +0200
Subject: Use partition-confg for newer devices

---
 lib/oxidized/model/acos.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/acos.rb b/lib/oxidized/model/acos.rb
index ec78711..37d2c4e 100644
--- a/lib/oxidized/model/acos.rb
+++ b/lib/oxidized/model/acos.rb
@@ -37,6 +37,14 @@ class ACOS < Oxidized::Model
      cfg
   end
 
+  cmd 'show partition-config all' do |cfg|
+     cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
+     cfg.gsub! /(Configuration last synchronized at).*/, '\\1 <removed>'
+     cfg
+  end  
+
   cmd 'show running-config all-partitions' do |cfg|
      cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
      cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
-- 
cgit v1.2.1


From e2fa16b811791c7e2a0563d7b57140b4ccb2a9b4 Mon Sep 17 00:00:00 2001
From: Arnoud Vermeer <a.vermeer@tech.leaseweb.com>
Date: Wed, 24 Aug 2016 09:45:11 +0200
Subject: Show partition-config all includes show running-config.

---
 lib/oxidized/model/acos.rb | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/acos.rb b/lib/oxidized/model/acos.rb
index 37d2c4e..47649a2 100644
--- a/lib/oxidized/model/acos.rb
+++ b/lib/oxidized/model/acos.rb
@@ -29,14 +29,6 @@ class ACOS < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show running-config' do |cfg|
-     cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
-     cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
-     cfg.gsub! /(Configuration last saved at).*/, '\\1 <removed>'
-     cfg.gsub! /(Configuration last synchronized at).*/, '\\1 <removed>'
-     cfg
-  end
-
   cmd 'show partition-config all' do |cfg|
      cfg.gsub! /(Current configuration).*/, '\\1 <removed>'
      cfg.gsub! /(Configuration last updated at).*/, '\\1 <removed>'
-- 
cgit v1.2.1


From 451ea95d70ca2773e6f7813a52627f622498589b Mon Sep 17 00:00:00 2001
From: Christoffer Stokbaek <christoffers@easyspeedy.com>
Date: Fri, 26 Aug 2016 16:35:17 +0200
Subject: config pull will not remove its revision time

---
 lib/oxidized/model/pfsense.rb | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/pfsense.rb b/lib/oxidized/model/pfsense.rb
index 8cb0118..9982d72 100644
--- a/lib/oxidized/model/pfsense.rb
+++ b/lib/oxidized/model/pfsense.rb
@@ -2,21 +2,12 @@ class PfSense < Oxidized::Model
 
   # use other use than 'admin' user, 'admin' user cannot get ssh/exec. See issue #535
   
-  comment  '# '
-  
-  #add a comment in the final conf
-  def add_comment comment
-    "\n###### #{comment} ######\n" 
-  end
-
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-2].join
   end
   
-  #show the persistent configuration
-  pre do
-    cfg = add_comment 'Configuration'
-    cfg += cmd 'cat /cf/conf/config.xml'    
+  cmd 'cat /cf/conf/config.xml' do |cfg|
+    cfg.gsub! /\s<revision>\s*<time>\d*<\/time>\s*.*\s*.*\s*<\/revision>/, ''
   end
   
   cfg :ssh do
-- 
cgit v1.2.1


From 97cb2fdaa9e6400d94e90dee024cac0aa62465bf Mon Sep 17 00:00:00 2001
From: MajesticFalcon <Schylarutley@hotmail.com>
Date: Sun, 28 Aug 2016 12:04:53 -0500
Subject: Add more extensive pattern matching

---
 lib/oxidized/model/routeros.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index 4822500..216252a 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -1,5 +1,5 @@
 class RouterOS < Oxidized::Model
-  prompt /\[\w+@\S+\]\s?>\s?$/
+  prompt /\[\w+@\S+(\s?\S+){0,}\]\s?>\s?$/
   comment "# "
 
   cmd '/system routerboard print' do |cfg|
-- 
cgit v1.2.1


From 9f4cd0105e6cd8a39771d3340e14b7cfca5440e2 Mon Sep 17 00:00:00 2001
From: MajesticFalcon <Schylarutley@hotmail.com>
Date: Sun, 28 Aug 2016 12:44:14 -0500
Subject: Changing {0,} -> *

---
 lib/oxidized/model/routeros.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index 216252a..fc96512 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -1,5 +1,5 @@
 class RouterOS < Oxidized::Model
-  prompt /\[\w+@\S+(\s?\S+){0,}\]\s?>\s?$/
+  prompt /\[\w+@\S+(\s?\S+)*\]\s?>\s?$/
   comment "# "
 
   cmd '/system routerboard print' do |cfg|
-- 
cgit v1.2.1


From 340aa7eff51f3c08a2764b3c5882b0568b1442fb Mon Sep 17 00:00:00 2001
From: MajesticFalcon <Schylarutley@hotmail.com>
Date: Tue, 30 Aug 2016 17:47:05 -0500
Subject: Adding Alvarion model

---
 lib/oxidized/model/alvarion | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 lib/oxidized/model/alvarion

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/alvarion b/lib/oxidized/model/alvarion
new file mode 100644
index 0000000..3c762de
--- /dev/null
+++ b/lib/oxidized/model/alvarion
@@ -0,0 +1,13 @@
+class Alvarion < Oxidized::Model
+
+  # Used in Alvarion wisp equipment
+
+  # Run this command as an instance of Model so we can access node
+  pre do
+    cmd "#{node.auth[:password]}.cfg"
+  end
+
+
+  cfg :tftp {}
+
+end
-- 
cgit v1.2.1


From 388db3a021317c0887b45f57b7045dbb81062a45 Mon Sep 17 00:00:00 2001
From: boudreau <yves.boudreau@mcgill.ca>
Date: Fri, 2 Sep 2016 10:32:51 -0400
Subject: Update catos.rb

---
 lib/oxidized/model/catos.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/catos.rb b/lib/oxidized/model/catos.rb
index 874ebbc..bac9eec 100644
--- a/lib/oxidized/model/catos.rb
+++ b/lib/oxidized/model/catos.rb
@@ -1,6 +1,6 @@
 class Catos < Oxidized::Model
 
-  prompt /^[\w.@-]+> \(enable\) $/
+  prompt /^[\w.@-]+>\s?(\(enable\) )?$/
   comment '# '
 
   cmd :all do |cfg|
@@ -28,8 +28,15 @@ class Catos < Oxidized::Model
     password /^Password:/
   end
 
-  cfg :ssh, :telnet do
+  cfg :telnet, :ssh do
     post_login 'set length 0'
+    # preferred way to handle additional passwords
+    if vars :enable
+      post_login do
+        send "enable\n"
+        cmd vars(:enable)
+      end
+    end
     pre_logout 'exit'
   end
 
-- 
cgit v1.2.1


From d6cdfc119f32bca57c69deb8bcdc83999a84740d Mon Sep 17 00:00:00 2001
From: gerard780 <gerard780@users.noreply.github.com>
Date: Tue, 6 Sep 2016 15:25:54 -0400
Subject: Remove extra new lines added by export command

---
 lib/oxidized/model/routeros.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/routeros.rb b/lib/oxidized/model/routeros.rb
index fc96512..a92ad5e 100644
--- a/lib/oxidized/model/routeros.rb
+++ b/lib/oxidized/model/routeros.rb
@@ -8,6 +8,7 @@ class RouterOS < Oxidized::Model
 
   cmd '/export' do |cfg|
     cfg.gsub! /\x1B\[([0-9]{1,3}((;[0-9]{1,3})*)?)?[m|K]/, '' # strip ANSI colours
+    cfg.gsub! /\\\r\n\s+/, ''   # strip new line
     cfg = cfg.split("\n").select { |line| not line[/^\#\s\w{3}\/\d{2}\/\d{4}.*$/] }
     cfg.join("\n") + "\n"
   end
-- 
cgit v1.2.1


From 56bac9722fe26ce8e0af54ec52ca0b17aa7c9fa1 Mon Sep 17 00:00:00 2001
From: Schylar Utley <sutley@cwep.com>
Date: Wed, 7 Sep 2016 16:48:15 -0700
Subject: Add OS-Model mapping in README

---
 lib/oxidized/model/alvarion | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 lib/oxidized/model/alvarion

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/alvarion b/lib/oxidized/model/alvarion
deleted file mode 100644
index 3c762de..0000000
--- a/lib/oxidized/model/alvarion
+++ /dev/null
@@ -1,13 +0,0 @@
-class Alvarion < Oxidized::Model
-
-  # Used in Alvarion wisp equipment
-
-  # Run this command as an instance of Model so we can access node
-  pre do
-    cmd "#{node.auth[:password]}.cfg"
-  end
-
-
-  cfg :tftp {}
-
-end
-- 
cgit v1.2.1


From 09e169eac9ee83f8460835f0a14e3c6a64f9c253 Mon Sep 17 00:00:00 2001
From: Danilo Sousa <dsgoncalves@uoldiveo.com>
Date: Wed, 21 Sep 2016 09:07:52 -0300
Subject: rollback `alvarion` model

wrongly removed in 56bac9722fe26ce8e0af54ec52ca0b17aa7c9fa1
---
 lib/oxidized/model/alvarion | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 lib/oxidized/model/alvarion

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/alvarion b/lib/oxidized/model/alvarion
new file mode 100644
index 0000000..3c762de
--- /dev/null
+++ b/lib/oxidized/model/alvarion
@@ -0,0 +1,13 @@
+class Alvarion < Oxidized::Model
+
+  # Used in Alvarion wisp equipment
+
+  # Run this command as an instance of Model so we can access node
+  pre do
+    cmd "#{node.auth[:password]}.cfg"
+  end
+
+
+  cfg :tftp {}
+
+end
-- 
cgit v1.2.1


From c17de76f1fd150a576dff05f8231720a88ae524b Mon Sep 17 00:00:00 2001
From: Cyril LAVIER <cyril.lavier@davromaniak.eu>
Date: Thu, 29 Sep 2016 11:51:03 +0200
Subject: Redoing the modifications on a up to date base

---
 lib/oxidized/model/apc_aos.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 lib/oxidized/model/apc_aos.rb

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/apc_aos.rb b/lib/oxidized/model/apc_aos.rb
new file mode 100644
index 0000000..530d436
--- /dev/null
+++ b/lib/oxidized/model/apc_aos.rb
@@ -0,0 +1,11 @@
+class Apc_aos < Oxidized::Model
+
+  cmd 'config.ini' do |cfg|
+    cfg.gsub! /^; Configuration file\, generated on.*/, ''
+  end
+
+  cfg :ftp do
+  end
+
+end
+
-- 
cgit v1.2.1


From d09f9c89c6422e813a470485327efe2cbb8963ca Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Fri, 30 Sep 2016 17:07:36 +0300
Subject: prompt not captured after sending enabe PW

fixes #577
---
 lib/oxidized/model/ironware.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/ironware.rb b/lib/oxidized/model/ironware.rb
index 1e8c30e..db341d1 100644
--- a/lib/oxidized/model/ironware.rb
+++ b/lib/oxidized/model/ironware.rb
@@ -2,14 +2,14 @@ class IronWare < Oxidized::Model
 
   prompt /^.*(telnet|ssh)\@.+[>#]\s?$/i
   comment  '! '
-  
+
   #to handle pager without enable
   #expect /^((.*)--More--(.*))$/ do |data, re|
   #  send ' '
   #  data.sub re, ''
   #end
 
-  
+
   #to remove backspace (if handle pager without enable)
   #expect /^((.*)[\b](.*))$/ do |data, re|
   #  data.sub re, ''
@@ -44,14 +44,14 @@ class IronWare < Oxidized::Model
       out << sc.rest
       cfg = out
     end
-    
+
     comment cfg
   end
-  
+
   cmd 'show flash' do |cfg|
     comment cfg
   end
-  
+
   cmd 'show module' do |cfg|
     cfg.gsub! /^((Invalid input)|(Type \?)).*$/, '' # some ironware devices are fixed config
     comment cfg
@@ -74,7 +74,7 @@ class IronWare < Oxidized::Model
     if vars :enable
       post_login do
         send "enable\r\n"
-        send vars(:enable) + "\r\n"
+        cmd vars(:enable)
       end
     end
     post_login ''
-- 
cgit v1.2.1


From c6a57ead5bd150128832c8cee30254846a1c22d8 Mon Sep 17 00:00:00 2001
From: boudreau <yves.boudreau@mcgill.ca>
Date: Tue, 4 Oct 2016 08:30:02 -0400
Subject: The \n is not seen as a lineline with ' it need "

---
 lib/oxidized/model/aosw.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/aosw.rb b/lib/oxidized/model/aosw.rb
index 394561f..d533727 100644
--- a/lib/oxidized/model/aosw.rb
+++ b/lib/oxidized/model/aosw.rb
@@ -60,8 +60,8 @@ class AOSW < Oxidized::Model
   cfg :telnet, :ssh do
     if vars :enable
       post_login do
-        send 'enable\n'
-        send vars(:enable) + '\n'
+        send "enable\n"
+        send vars(:enable) + "\n"
       end
     end
     post_login 'no paging'
-- 
cgit v1.2.1


From 6ed048e1772bf236f34b3ad71f8ae40f992dd034 Mon Sep 17 00:00:00 2001
From: Denver Abrey <denvera@gmail.com>
Date: Mon, 17 Oct 2016 22:33:40 +0200
Subject: Fix blank pfSense configs being saved if regex doesn't match

---
 lib/oxidized/model/pfsense.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/pfsense.rb b/lib/oxidized/model/pfsense.rb
index 9982d72..55e7e85 100644
--- a/lib/oxidized/model/pfsense.rb
+++ b/lib/oxidized/model/pfsense.rb
@@ -8,6 +8,7 @@ class PfSense < Oxidized::Model
   
   cmd 'cat /cf/conf/config.xml' do |cfg|
     cfg.gsub! /\s<revision>\s*<time>\d*<\/time>\s*.*\s*.*\s*<\/revision>/, ''
+    cfg
   end
   
   cfg :ssh do
-- 
cgit v1.2.1


From d483d4e4be33c2062794d2d6aef7ce16eba223b2 Mon Sep 17 00:00:00 2001
From: Denver Abrey <denvera@gmail.com>
Date: Wed, 19 Oct 2016 01:12:48 +0200
Subject: Update regex to match newer pfSense config files

---
 lib/oxidized/model/pfsense.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/pfsense.rb b/lib/oxidized/model/pfsense.rb
index 55e7e85..c02c0d0 100644
--- a/lib/oxidized/model/pfsense.rb
+++ b/lib/oxidized/model/pfsense.rb
@@ -7,7 +7,7 @@ class PfSense < Oxidized::Model
   end
   
   cmd 'cat /cf/conf/config.xml' do |cfg|
-    cfg.gsub! /\s<revision>\s*<time>\d*<\/time>\s*.*\s*.*\s*<\/revision>/, ''
+    cfg.gsub! /\s<revision>\s*.*\s*<time>\d*<\/time>\s*.*\s*<\/revision>/, ''
     cfg
   end
   
-- 
cgit v1.2.1


From ee48fd9512df8ec839119317f58319a18a398c22 Mon Sep 17 00:00:00 2001
From: Christoffer Stokbaek <christoffers@easyspeedy.com>
Date: Tue, 25 Oct 2016 11:03:10 +0200
Subject: Added support for fujitsu blade switches

---
 lib/oxidized/model/fujitsupy.rb | 42 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 lib/oxidized/model/fujitsupy.rb

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/fujitsupy.rb b/lib/oxidized/model/fujitsupy.rb
new file mode 100644
index 0000000..20a78dd
--- /dev/null
+++ b/lib/oxidized/model/fujitsupy.rb
@@ -0,0 +1,42 @@
+class FujitsuPY < Oxidized::Model
+
+  prompt /^(\([\w.-]*\)\s#|^\S+\#\s)$/
+  comment  '! '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+# 1Gbe switch
+  cmd 'show version' do |cfg|
+    cfg.gsub! /^(<ERROR> : 2 : format error)$/, ''
+    comment cfg
+  end
+
+# 10Gbe switch
+  cmd 'show system information' do |cfg|
+    cfg.gsub! /^Current-time : [\w\s:]*$/, ''
+    cfg.gsub! /^(\s{33}\^)$/, ''
+    cfg.gsub! /^(\% Invalid input detected at '\^' marker.)$/, ''
+    comment cfg
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'no pager'
+    post_login 'terminal pager disable'
+    pre_logout do
+      send "quit\n"
+      send "n\n"
+    end
+  end
+
+end
-- 
cgit v1.2.1


From f8f5d43f732b7567dc26a2c12cc13f44a604458c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20Lindsj=C3=B6?= <eric.lindsjo@glesys.se>
Date: Wed, 26 Oct 2016 09:01:37 +0200
Subject: Added Support for MRV FiberDriver Linux based management module

---
 lib/oxidized/model/fiberdriver.rb | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 lib/oxidized/model/fiberdriver.rb

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/fiberdriver.rb b/lib/oxidized/model/fiberdriver.rb
new file mode 100644
index 0000000..8f8eb07
--- /dev/null
+++ b/lib/oxidized/model/fiberdriver.rb
@@ -0,0 +1,21 @@
+class FiberDriver < Oxidized::Model
+  prompt /\w+#/
+  comment "! "
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+  cmd 'show inventory' do |cfg|
+    comment cfg
+  end
+
+  cmd "show running-config" do |cfg|
+    cfg.each_line.to_a[3..-1].join
+  end
+
+  cfg :ssh do
+    post_login 'terminal length 0'
+    post_login 'terminal width 512'
+    pre_logout 'exit'
+  end
+end
-- 
cgit v1.2.1


From c41b79b5a51b1b8d913c3f9c7478718bf3183a4b Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 27 Oct 2016 14:28:00 +0200
Subject: add support for the HPE BladeSystem

---
 lib/oxidized/model/hpebladesystem.rb | 83 ++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 lib/oxidized/model/hpebladesystem.rb

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/hpebladesystem.rb b/lib/oxidized/model/hpebladesystem.rb
new file mode 100644
index 0000000..5e34de8
--- /dev/null
+++ b/lib/oxidized/model/hpebladesystem.rb
@@ -0,0 +1,83 @@
+class HPEBladeSystem < Oxidized::Model
+  # HPE Onboard Administrator
+
+  prompt /.*> /
+  comment '# '
+
+  expect /^\s*--More--\s+.*$/ do |data, re|
+     send ' '
+     data.sub re, ''
+  end
+
+  cmd :all do |cfg|
+    cfg = cfg.delete("\r").each_line.to_a[0..-1].map{|line|line.rstrip}.join("\n") + "\n"
+    cfg.each_line.to_a[0..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(SET SNMP COMMUNITY (READ|WRITE)).*/, '\\1 <configuration removed>'
+    cfg
+  end
+
+  cmd 'show oa info' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show oa network' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show oa certificate' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show sshfingerprint' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show fru' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show network' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show vlan' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show rack name' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show server list' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show server names' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show server port map all' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show server info all' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show config' do |cfg|
+    cfg.gsub! /^#(Generated on:) .*$/, '\\1 <removed>'
+    cfg.gsub /^\s+/, ''
+  end
+  
+  cfg :telnet do
+    username /\slogin:/
+    password /^Password: /
+  end
+ 
+   cfg :telnet, :ssh do
+     pre_logout "exit"
+   end
+end
-- 
cgit v1.2.1


From 98ee2d2fadd56b9efadfc4f9ff667f71f6b22f6c Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Mon, 31 Oct 2016 17:54:47 +0200
Subject: Allow model to specify SSH PTY options

---
 lib/oxidized/model/procurve.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/procurve.rb b/lib/oxidized/model/procurve.rb
index da792e6..c117df3 100644
--- a/lib/oxidized/model/procurve.rb
+++ b/lib/oxidized/model/procurve.rb
@@ -57,4 +57,8 @@ class Procurve < Oxidized::Model
     pre_logout "logout\ny\nn"
   end
 
+  cfg :ssh do
+    pty_options({ chars_wide: 1000 })
+  end
+
 end
-- 
cgit v1.2.1


From 2e9563eedf8dabb53a0cd3fe0ca1a1b0055c561c Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Mon, 31 Oct 2016 16:14:37 +0100
Subject: add Planet SGS switches

---
 lib/oxidized/model/planetsgs.rb | 63 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 lib/oxidized/model/planetsgs.rb

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/planetsgs.rb b/lib/oxidized/model/planetsgs.rb
new file mode 100644
index 0000000..c240237
--- /dev/null
+++ b/lib/oxidized/model/planetsgs.rb
@@ -0,0 +1,63 @@
+class PlanetSGS < Oxidized::Model
+
+  prompt /^\r?([\w.@()-]+[#>]\s?)$/
+  comment  '! '
+
+  # example how to handle pager
+  #expect /^\s--More--\s+.*$/ do |data, re|
+  # send ' '
+  # data.sub re, ''
+  #end
+
+  # non-preferred way to handle additional PW prompt
+  #expect /^[\w.]+>$/ do |data|
+  #  send "enable\n"
+  #  send vars(:enable) + "\n"
+  #  data
+  #end
+
+  cmd :all do |cfg|
+    #cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
+    #cfg.gsub! /\cH+/, ''              # example how to handle pager
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
+    cfg.gsub! /^username \S+ password \d \S+/, '<secret hidden>'
+    cfg.gsub! /^enable password \d \S+/, '<secret hidden>'
+    cfg.gsub! /wpa-psk ascii \d \S+/, '<secret hidden>'
+    cfg.gsub! /^tacacs-server key \d \S+/, '<secret hidden>'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg.each_line.to_a[0..-2].join
+  end
+
+
+  cmd 'show running-config'
+  
+  cmd 'show transceiver detail | include transceiver detail information|found|Type|length|Nominal|wavelength|Base information' do |cfg|
+    comment cfg
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'terminal length 0'
+    # preferred way to handle additional passwords
+    if vars :enable
+      post_login do
+        send "enable\n"
+        cmd vars(:enable)
+      end
+    end
+    pre_logout 'exit'
+  end
+
+end
-- 
cgit v1.2.1


From 65007bab6e94c7ba96be177c3fe8e7fdaed9587e Mon Sep 17 00:00:00 2001
From: jackson-tim <jackson.tim@gmail.com>
Date: Mon, 31 Oct 2016 17:47:05 -0500
Subject: Update dnos.rb

Handles old DNOS switches that do not allow term length 0 prior to enable, and double exits in case of enable..
---
 lib/oxidized/model/dnos.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/dnos.rb b/lib/oxidized/model/dnos.rb
index 1c31aad..a6cc05f 100644
--- a/lib/oxidized/model/dnos.rb
+++ b/lib/oxidized/model/dnos.rb
@@ -33,15 +33,16 @@ class DNOS  < Oxidized::Model
   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
+    post_login 'terminal length 0'
+    post_login 'terminal width 0'
     pre_logout 'exit'
+    pre_logout 'exit'    
   end
 
 end
-- 
cgit v1.2.1


From e5dc1dedf976a12c278f68c284c976ed462cdcb4 Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Tue, 1 Nov 2016 02:04:31 +0200
Subject: expect prompt after sending enable password

---
 lib/oxidized/model/dnos.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/dnos.rb b/lib/oxidized/model/dnos.rb
index a6cc05f..a44630e 100644
--- a/lib/oxidized/model/dnos.rb
+++ b/lib/oxidized/model/dnos.rb
@@ -36,7 +36,7 @@ class DNOS  < Oxidized::Model
     if vars :enable
       post_login do
         send "enable\n"
-        send vars(:enable) + "\n"
+        cmd vars(:enable)
       end
     end
     post_login 'terminal length 0'
-- 
cgit v1.2.1


From 60ee472e2cb62b6bae6ab118ec102108b81148b7 Mon Sep 17 00:00:00 2001
From: Robert Drake <rdrake@direcpath.com>
Date: Fri, 4 Nov 2016 14:17:52 -0400
Subject: Added support for Trango/Trangolink-45

I only have the Trangolink-45 so I'm not sure which other radios this
might support.
---
 lib/oxidized/model/trango.rb | 62 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 lib/oxidized/model/trango.rb

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/trango.rb b/lib/oxidized/model/trango.rb
new file mode 100644
index 0000000..b2aa1e7
--- /dev/null
+++ b/lib/oxidized/model/trango.rb
@@ -0,0 +1,62 @@
+class Trango < Oxidized::Model
+  # take a Trangolink sysinfo output and turn it into a configuration file
+  
+  prompt /^#>\s?/
+  comment  '# '
+
+  cmd 'sysinfo' do |cfg|
+    out = []
+    comments = []
+    cfg.each_line do |line|
+      if line.match /\[Opmode\] (off|on) \[Default Opmode\] (off|on)/
+        out << "opmode " + Regexp.last_match[1]
+        out << "defaultopmode " + Regexp.last_match[2]
+      end
+      if line.match /\[Tx Power\] ([\-\d]+) dBm/
+        out << "power " + Regexp.last_match[1]
+      end
+      if line.match /\[Active Channel\] (\d+) (v|h)/
+        out << "freq " + Regexp.last_match[1] + ' ' + Regexp.last_match[2]
+      end
+      if line.match /\[Peer ID\] ([A-F0-9]+)/
+        out << "peerid " + Regexp.last_match[1]
+      end
+      if line.match /\[Unit Type\] (\S+)/
+        out << "utype " + Regexp.last_match[1]
+      end
+      if line.match /\[(Hardware Version|Firmware Version|Model|S\/N)\] (\S+)/
+        comments << '# ' + Regexp.last_match[1] + ': ' + Regexp.last_match[2]
+      end
+      if line.match /\[Remarks\] (\S+)/
+        out << "remarks " + Regexp.last_match[1]
+      end
+      if line.match /\[RSSI LED\] (on|off)/
+        out << "rssiled " + Regexp.last_match[1]
+      end
+      if line.match /\[Speed\] (\d+) Mbps/
+        speed = Regexp.last_match[1]
+      end
+      if line.match /\[Tx MIR\] (\d+) Kbps/
+        out << "mir ".concat(Regexp.last_match[1])
+      end
+      if line.match /\[Auto Rate Shift\] (on|off)/
+        out << "autorateshift ".concat(Regexp.last_match[1])
+        if Regexp.last_match[1].eql? 'off'
+          out << "speed $speed"
+        end
+      end
+      if line.match /\[IP\] (\S+) \[Subnet Mask\] (\S+) \[Gateway\] (\S+)/
+        out << "ipconfig " + Regexp.last_match[1] + ' ' +
+                              Regexp.last_match[2] + ' ' +
+                              Regexp.last_match[3]
+      end
+    end 
+    comments.push(*out).join "\n"
+  end 
+
+  cfg :telnet do
+    password /Password:/
+    pre_logout 'exit'
+  end
+ 
+end
-- 
cgit v1.2.1


From 8862e0b303b2fdc4c50992cfbffbbccb9b88bc91 Mon Sep 17 00:00:00 2001
From: Robert Drake <rdrake@direcpath.com>
Date: Fri, 4 Nov 2016 14:21:09 -0400
Subject: This adds support for the Casa C1G CMTS

This will probably work for the other Casa CMTS as well.
---
 lib/oxidized/model/casa.rb | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 lib/oxidized/model/casa.rb

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/casa.rb b/lib/oxidized/model/casa.rb
new file mode 100644
index 0000000..e85c904
--- /dev/null
+++ b/lib/oxidized/model/casa.rb
@@ -0,0 +1,46 @@
+class Casa < Oxidized::Model
+  # Casa Systems CMTS
+
+  prompt /^([\w.@()-]+[#>]\s?)$/
+  comment '! '
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp community) \S+/, '\\1 <configuration removed>'
+    cfg.gsub! /^(snmp comm-tbl) \S+ \S+/, '\\1 <removed> <removed>'
+    cfg.gsub! /^(console-password encrypted) \S+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(password encrypted) \S+/, '\\1 <secret hidden>'
+    cfg.gsub! /^(tacacs-server key) \S+/, '\\1 <secret hidden>'
+    cfg
+  end
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd 'show system' do |cfg|
+    comment cfg.each_line.reject { |line| line.match /^\s+System (Time|Uptime): / }.join
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show run'
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'page-off'
+    # preferred way to handle additional passwords
+    if vars :enable
+      post_login do
+        send "enable\n"
+        cmd vars(:enable)
+      end
+    end
+    pre_logout 'logout'
+  end
+end
-- 
cgit v1.2.1


From 0b903fe94c2673930f03a676b83e84277f51d010 Mon Sep 17 00:00:00 2001
From: Robert Drake <rdrake@direcpath.com>
Date: Fri, 4 Nov 2016 14:23:17 -0400
Subject: This adds support for D-Link switches

This specifically supports DES-3526/3550 series switches.
---
 lib/oxidized/model/dlink.rb | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 lib/oxidized/model/dlink.rb

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/dlink.rb b/lib/oxidized/model/dlink.rb
new file mode 100644
index 0000000..5756bad
--- /dev/null
+++ b/lib/oxidized/model/dlink.rb
@@ -0,0 +1,36 @@
+class Dlink < Oxidized::Model
+  # D-LINK Switches
+
+  prompt /^(\r*[\w.@():-]+[#>]\s?)$/
+  comment '# '
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(create snmp community) \S+/, '\\1 <removed>'
+    cfg.gsub! /^(create snmp group) \S+/, '\\1 <removed>'
+    cfg
+  end
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[2..-2].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
+  end
+
+  cmd 'show switch' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show vlan' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show config current'
+
+  cfg :telnet do
+    username /\r*username:/
+    password /\r*password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'disable clipaging'
+    pre_logout 'logout'
+  end
+end
-- 
cgit v1.2.1


From 2b05133b001c564676554bae05baa34a9900fbe0 Mon Sep 17 00:00:00 2001
From: Robert Drake <rdrake@direcpath.com>
Date: Fri, 4 Nov 2016 14:26:20 -0400
Subject: This adds support for Hatteras Networks devices

---
 lib/oxidized/model/hatteras.rb | 52 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 lib/oxidized/model/hatteras.rb

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/hatteras.rb b/lib/oxidized/model/hatteras.rb
new file mode 100644
index 0000000..4192cbc
--- /dev/null
+++ b/lib/oxidized/model/hatteras.rb
@@ -0,0 +1,52 @@
+class Hatteras < Oxidized::Model
+  # Hatteras Networks
+
+  prompt /^(\r?[\w.@()-]+[#>]\s?)$/
+  comment '# '
+
+  expect /WARNING: System configuration changes will be lost when the device restarts./ do |data, re|
+    send "y\r"
+    data.sub re, ''
+  end
+
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(community) \S+/, '\\1 "<configuration removed>"'
+    cfg.gsub! /^(communityString) "\S+"/, '\\1 "<configuration removed>"'
+    cfg.gsub! /^(key) "\S+"/, '\\1 "<secret hidden>"'
+    cfg
+  end
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd "show switch\r" do |cfg|
+    cfg = cfg.each_line.reject { |line| line.match /Switch uptime|Switch temperature|Last reset reason/ or
+                                          line.match /TermCpuUtil|^\s+\^$|ERROR: Bad command/ }.join
+    comment cfg
+  end
+
+  cmd "show card\r" do |cfg|
+    cfg = cfg.each_line.reject { |line| line.match /Card uptime|Card temperature|Last reset reason/ or
+                                          line.match /TermCpuUtil|^\s+\^$|ERROR: Bad command/ }.join
+    comment cfg
+  end
+
+  cmd "show sfp *\r" do |cfg|
+    comment cfg
+  end
+
+  cmd "show config run\r" do |cfg|
+    cfg
+  end
+
+  cfg :telnet do
+    username /^Login:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    pre_logout "logout\r"
+  end
+end
-- 
cgit v1.2.1


From 3da39c49e24b064af5fdd754da787e95dc2e1c06 Mon Sep 17 00:00:00 2001
From: Robert Drake <rdrake@direcpath.com>
Date: Wed, 9 Nov 2016 23:43:54 -0500
Subject: renamed  alvarion -> alvarion.rb

I believe from this:
require File.join dir, file+'.rb'

That the only way this model would work is if it has a .rb extension.  I
don't have any of these devices to test if this works.
---
 lib/oxidized/model/alvarion    | 13 -------------
 lib/oxidized/model/alvarion.rb | 13 +++++++++++++
 2 files changed, 13 insertions(+), 13 deletions(-)
 delete mode 100644 lib/oxidized/model/alvarion
 create mode 100644 lib/oxidized/model/alvarion.rb

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/alvarion b/lib/oxidized/model/alvarion
deleted file mode 100644
index 3c762de..0000000
--- a/lib/oxidized/model/alvarion
+++ /dev/null
@@ -1,13 +0,0 @@
-class Alvarion < Oxidized::Model
-
-  # Used in Alvarion wisp equipment
-
-  # Run this command as an instance of Model so we can access node
-  pre do
-    cmd "#{node.auth[:password]}.cfg"
-  end
-
-
-  cfg :tftp {}
-
-end
diff --git a/lib/oxidized/model/alvarion.rb b/lib/oxidized/model/alvarion.rb
new file mode 100644
index 0000000..3c762de
--- /dev/null
+++ b/lib/oxidized/model/alvarion.rb
@@ -0,0 +1,13 @@
+class Alvarion < Oxidized::Model
+
+  # Used in Alvarion wisp equipment
+
+  # Run this command as an instance of Model so we can access node
+  pre do
+    cmd "#{node.auth[:password]}.cfg"
+  end
+
+
+  cfg :tftp {}
+
+end
-- 
cgit v1.2.1


From eaaef17151017210bb20a936c89b43584914f92c Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 10 Nov 2016 22:19:40 +0100
Subject: add support for PLANET SG switches

So far, only SGS switches were supported.

Now, we check the model type during the 'show version' command, and only
execute the 'show transceiver details' command in case an SGS switch was
detected (as its not supported on SG models).
We will also strip lines containing the current System Time and Uptime.
These only appear on SG models, but it's a good idea to strip them anyways.
---
 lib/oxidized/model/planet.rb    | 83 +++++++++++++++++++++++++++++++++++++++++
 lib/oxidized/model/planetsgs.rb | 63 -------------------------------
 2 files changed, 83 insertions(+), 63 deletions(-)
 create mode 100644 lib/oxidized/model/planet.rb
 delete mode 100644 lib/oxidized/model/planetsgs.rb

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/planet.rb b/lib/oxidized/model/planet.rb
new file mode 100644
index 0000000..05a369a
--- /dev/null
+++ b/lib/oxidized/model/planet.rb
@@ -0,0 +1,83 @@
+class Planet < Oxidized::Model
+
+  prompt /^\r?([\w.@()-]+[#>]\s?)$/
+  comment  '! '
+
+  # example how to handle pager
+  #expect /^\s--More--\s+.*$/ do |data, re|
+  # send ' '
+  # data.sub re, ''
+  #end
+
+  # non-preferred way to handle additional PW prompt
+  #expect /^[\w.]+>$/ do |data|
+  #  send "enable\n"
+  #  send vars(:enable) + "\n"
+  #  data
+  #end
+
+  cmd :all do |cfg|
+    #cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
+    #cfg.gsub! /\cH+/, ''              # example how to handle pager
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd :secret do |cfg|
+    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
+    cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
+    cfg.gsub! /^username \S+ password \d \S+/, '<secret hidden>'
+    cfg.gsub! /^enable password \d \S+/, '<secret hidden>'
+    cfg.gsub! /wpa-psk ascii \d \S+/, '<secret hidden>'
+    cfg.gsub! /^tacacs-server key \d \S+/, '<secret hidden>'
+    cfg
+  end
+
+  cmd 'show version' do |cfg|
+    cfg.gsub! "\n\r", "\n"
+    @planetgs = true if cfg.match /^System Name\w*:\w*GS-.*$/
+    @planetsgs = true if cfg.match /SGS-(.*) Device, Compiled on .*$/
+
+    cfg = cfg.each_line.to_a[0...-2]
+
+   # Strip system time and system uptime from planet gs switches
+    cfg = cfg.reject { |line| line.match /System Time\s*:.*/ }
+    cfg = cfg.reject { |line| line.match /System Uptime\s*:.*/ }
+
+    comment cfg.join
+  end
+
+
+  cmd 'show running-config' do |cfg|
+    cfg.gsub! "\n\r", "\n"
+    cfg = cfg.each_line.to_a
+
+    cfg = cfg.reject { |line| line.match "Building configuration..." }
+  
+    if @planetsgs
+      cfg << cmd('show transceiver detail | include transceiver detail information|found|Type|length|Nominal|wavelength|Base information') do |cfg|
+        comment cfg
+      end
+    end
+
+    cfg.join
+  end
+  
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'terminal length 0'
+    # preferred way to handle additional passwords
+    if vars :enable
+      post_login do
+        send "enable\n"
+        cmd vars(:enable)
+      end
+    end
+    pre_logout 'exit'
+  end
+
+end
diff --git a/lib/oxidized/model/planetsgs.rb b/lib/oxidized/model/planetsgs.rb
deleted file mode 100644
index c240237..0000000
--- a/lib/oxidized/model/planetsgs.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-class PlanetSGS < Oxidized::Model
-
-  prompt /^\r?([\w.@()-]+[#>]\s?)$/
-  comment  '! '
-
-  # example how to handle pager
-  #expect /^\s--More--\s+.*$/ do |data, re|
-  # send ' '
-  # data.sub re, ''
-  #end
-
-  # non-preferred way to handle additional PW prompt
-  #expect /^[\w.]+>$/ do |data|
-  #  send "enable\n"
-  #  send vars(:enable) + "\n"
-  #  data
-  #end
-
-  cmd :all do |cfg|
-    #cfg.gsub! /\cH+\s{8}/, ''         # example how to handle pager
-    #cfg.gsub! /\cH+/, ''              # example how to handle pager
-    cfg.each_line.to_a[1..-2].join
-  end
-
-  cmd :secret do |cfg|
-    cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
-    cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
-    cfg.gsub! /^username \S+ password \d \S+/, '<secret hidden>'
-    cfg.gsub! /^enable password \d \S+/, '<secret hidden>'
-    cfg.gsub! /wpa-psk ascii \d \S+/, '<secret hidden>'
-    cfg.gsub! /^tacacs-server key \d \S+/, '<secret hidden>'
-    cfg
-  end
-
-  cmd 'show version' do |cfg|
-    comment cfg.each_line.to_a[0..-2].join
-  end
-
-
-  cmd 'show running-config'
-  
-  cmd 'show transceiver detail | include transceiver detail information|found|Type|length|Nominal|wavelength|Base information' do |cfg|
-    comment cfg
-  end
-
-  cfg :telnet do
-    username /^Username:/
-    password /^Password:/
-  end
-
-  cfg :telnet, :ssh do
-    post_login 'terminal length 0'
-    # preferred way to handle additional passwords
-    if vars :enable
-      post_login do
-        send "enable\n"
-        cmd vars(:enable)
-      end
-    end
-    pre_logout 'exit'
-  end
-
-end
-- 
cgit v1.2.1


From 689d4dba60de7a1faf555011f9db6fb3aef2fbea Mon Sep 17 00:00:00 2001
From: Saku Ytti <saku@ytti.fi>
Date: Fri, 11 Nov 2016 12:02:15 +0200
Subject: expect prompt after entering enable password

---
 lib/oxidized/model/powerconnect.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb
index f0fa3df..ac36c26 100644
--- a/lib/oxidized/model/powerconnect.rb
+++ b/lib/oxidized/model/powerconnect.rb
@@ -39,7 +39,7 @@ class PowerConnect < Oxidized::Model
     if vars :enable
       post_login do
         send "enable\n"
-        send vars(:enable) + "\n"
+        cmd vars(:enable)
       end
     end
 
-- 
cgit v1.2.1


From 31e8e32509f353e5bf554714b35cf3dd799b3090 Mon Sep 17 00:00:00 2001
From: Atroskelis <fanachos@gmail.com>
Date: Fri, 18 Nov 2016 16:47:08 +0200
Subject: Update ciscosmb.rb

Adapted for SG series, not sure about SF.

Please test.
---
 lib/oxidized/model/ciscosmb.rb | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/ciscosmb.rb b/lib/oxidized/model/ciscosmb.rb
index 3ef9a85..3d9b10d 100644
--- a/lib/oxidized/model/ciscosmb.rb
+++ b/lib/oxidized/model/ciscosmb.rb
@@ -33,14 +33,11 @@ class CiscoSMB < Oxidized::Model
     cfg
   end
 
-  cfg :telnet do
+  cfg :telnet, :ssh do
     username /^User Name:/
     password /^\r?Password:$/
-  end
-
-  cfg :telnet, :ssh do
-    post_login 'terminal datadump' # Disable pager
-    post_login 'terminal width 0'
+    post_login 'terminal len 0'
+    pre_logout 'exit' #exit returns to previous priv level, no way to quit from exec(#)
     pre_logout 'exit'
   end
 
-- 
cgit v1.2.1


From df08feadfa68eb3493a6b0e60a1ef8f667936d4d Mon Sep 17 00:00:00 2001
From: Atroskelis <fanachos@gmail.com>
Date: Fri, 18 Nov 2016 16:52:14 +0200
Subject: Update ciscosmb.rb

Forgot the username prompt change.
---
 lib/oxidized/model/ciscosmb.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/ciscosmb.rb b/lib/oxidized/model/ciscosmb.rb
index 3d9b10d..96baa7d 100644
--- a/lib/oxidized/model/ciscosmb.rb
+++ b/lib/oxidized/model/ciscosmb.rb
@@ -34,7 +34,7 @@ class CiscoSMB < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
-    username /^User Name:/
+    username /^Username:/
     password /^\r?Password:$/
     post_login 'terminal len 0'
     pre_logout 'exit' #exit returns to previous priv level, no way to quit from exec(#)
-- 
cgit v1.2.1


From 9fdddda636f3f606a5eb7330e91a1c1a3a4a68a3 Mon Sep 17 00:00:00 2001
From: Atroskelis <fanachos@gmail.com>
Date: Fri, 18 Nov 2016 17:22:06 +0200
Subject: Update ciscosmb.rb

Added old commands in case of different CLI variations.
---
 lib/oxidized/model/ciscosmb.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/ciscosmb.rb b/lib/oxidized/model/ciscosmb.rb
index 96baa7d..73151f8 100644
--- a/lib/oxidized/model/ciscosmb.rb
+++ b/lib/oxidized/model/ciscosmb.rb
@@ -36,6 +36,8 @@ class CiscoSMB < Oxidized::Model
   cfg :telnet, :ssh do
     username /^Username:/
     password /^\r?Password:$/
+    post_login 'terminal datadump' # Disable pager
+    post_login 'terminal width 0'
     post_login 'terminal len 0'
     pre_logout 'exit' #exit returns to previous priv level, no way to quit from exec(#)
     pre_logout 'exit'
-- 
cgit v1.2.1


From f15bf6ac203f3cd1774d72eb0fc16aac807f7bc0 Mon Sep 17 00:00:00 2001
From: jbaker48 <jonbaker85@gmail.com>
Date: Tue, 6 Dec 2016 21:05:23 +1100
Subject: exclude time from output

---
 lib/oxidized/model/eos.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/eos.rb b/lib/oxidized/model/eos.rb
index 75da0fa..bbcb4e2 100644
--- a/lib/oxidized/model/eos.rb
+++ b/lib/oxidized/model/eos.rb
@@ -22,7 +22,7 @@ class EOS < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show running-config | no-more' do |cfg|
+  cmd 'show running-config | no-more | exclude Time:' do |cfg|
     cfg
   end
 
-- 
cgit v1.2.1


From 59851430fd2363940f435ca58c6a2fb6928d472e Mon Sep 17 00:00:00 2001
From: jbaker48 <jonbaker85@gmail.com>
Date: Tue, 6 Dec 2016 21:23:20 +1100
Subject: Update eos.rb

---
 lib/oxidized/model/eos.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/eos.rb b/lib/oxidized/model/eos.rb
index bbcb4e2..a9f3ff3 100644
--- a/lib/oxidized/model/eos.rb
+++ b/lib/oxidized/model/eos.rb
@@ -22,7 +22,7 @@ class EOS < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show running-config | no-more | exclude Time:' do |cfg|
+  cmd 'show running-config | no-more | exclude ! Time:' do |cfg|
     cfg
   end
 
-- 
cgit v1.2.1


From 47e876c134da3b4f067fcd742fe8ea369b4b4747 Mon Sep 17 00:00:00 2001
From: Thane Gill <me@thanegill.com>
Date: Wed, 7 Dec 2016 08:17:44 -0800
Subject: Remove trailing whitespace and enable prompt detection

Fixes: #630
---
 lib/oxidized/model/aosw.rb | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/aosw.rb b/lib/oxidized/model/aosw.rb
index d533727..11d8442 100644
--- a/lib/oxidized/model/aosw.rb
+++ b/lib/oxidized/model/aosw.rb
@@ -28,19 +28,21 @@ class AOSW < Oxidized::Model
 
   cmd 'show version' do |cfg|
     cfg = cfg.each_line.select { |line| not line.match /Switch uptime/i }
-    comment cfg.join
+    rstrip_cfg comment cfg.join
   end
 
   cmd 'show inventory' do |cfg|
-    clean cfg
+    rstrip_cfg clean cfg
   end
 
   cmd 'show slots' do |cfg|
-    comment cfg
+    rstrip_cfg comment cfg
   end
+
   cmd 'show license' do |cfg|
-    comment cfg
+    rstrip_cfg comment cfg
   end
+
   cmd 'show running-config' do |cfg|
     out = []
     cfg.each_line do |line|
@@ -61,7 +63,7 @@ class AOSW < Oxidized::Model
     if vars :enable
       post_login do
         send "enable\n"
-        send vars(:enable) + "\n"
+        cmd vars(:enable)
       end
     end
     post_login 'no paging'
@@ -72,6 +74,15 @@ class AOSW < Oxidized::Model
     pre_logout 'exit'
   end
 
+  def rstrip_cfg cfg
+    out = []
+    cfg.each_line do |line|
+      out << line.rstrip
+    end
+    out = out.join "\n"
+    out << "\n"
+  end
+
   def clean cfg
     out = []
     cfg.each_line do |line|
-- 
cgit v1.2.1


From 61d9981aa0bc6ac014a03f3055ec432bc0c5089f Mon Sep 17 00:00:00 2001
From: Mike Rostermund <mike@kollegienet.dk>
Date: Wed, 7 Dec 2016 22:41:02 +0100
Subject: Fix suggested by ytti for issue #610

---
 lib/oxidized/model/ciscosmb.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/ciscosmb.rb b/lib/oxidized/model/ciscosmb.rb
index 73151f8..e5501d5 100644
--- a/lib/oxidized/model/ciscosmb.rb
+++ b/lib/oxidized/model/ciscosmb.rb
@@ -34,7 +34,7 @@ class CiscoSMB < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
-    username /^Username:/
+    username /^User ?[nN]ame:/
     password /^\r?Password:$/
     post_login 'terminal datadump' # Disable pager
     post_login 'terminal width 0'
-- 
cgit v1.2.1


From 72bc119966b20eb239c989ceb833051791f44007 Mon Sep 17 00:00:00 2001
From: mattttv <dev.matv@xoxy.net>
Date: Wed, 14 Dec 2016 13:31:34 +0100
Subject: delete secret password if it is called secret

---
 lib/oxidized/model/ios.rb | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/oxidized/model')

diff --git a/lib/oxidized/model/ios.rb b/lib/oxidized/model/ios.rb
index 1f099c8..3cbe0f0 100644
--- a/lib/oxidized/model/ios.rb
+++ b/lib/oxidized/model/ios.rb
@@ -26,7 +26,9 @@ class IOS < Oxidized::Model
     cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
     cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
     cfg.gsub! /^username \S+ password \d \S+/, '<secret hidden>'
+    cfg.gsub! /^username \S+ secret \d \S+/, '<secret hidden>'
     cfg.gsub! /^enable password \d \S+/, '<secret hidden>'
+    cfg.gsub! /^enable secret \d \S+/, '<secret hidden>'
     cfg.gsub! /wpa-psk ascii \d \S+/, '<secret hidden>'
     cfg.gsub! /^tacacs-server key \d \S+/, '<secret hidden>'
     cfg
-- 
cgit v1.2.1