oxidized 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe68595d80d195deeed1f0642975a4881779798e
-  data.tar.gz: 3b46e88817bbd6a0a9fa9e1bff7afe64f3a55e98
+  metadata.gz: dd1e30df648aee0f0e1a19d7a55bb91879e0456b
+  data.tar.gz: 239581a70a3709f67173cb59bf0288bcff6a4b7d
 SHA512:
-  metadata.gz: 62dca2064aa9aca2121e509cdd43f93840ae153991d970804598acaa7fdaf4408928ecdd471b47c5878f519b553a2225d8fb04047b1b855a821570ff87e87b9a
-  data.tar.gz: f8a988620c3d3d8f95f12abbe0a3d1d349570c713e3c8c0e491dc3726e0d1a96099ac637e29fe0365f323d53631d1af1c6cb0122b35543110a46027cd59da11a
+  metadata.gz: 98c9644577c24e064c415e985b09f501ef4ce9153a9ab3e7921fcb6093057e037cccc3157c8d2eca71660641501670e9840a57abd45d330ad5b482e8ec640148
+  data.tar.gz: 4c9cfe10817d51454ceaca602e10d8dc08d283b8f7a1c850185064369840eb0c80f6479a513ffa2fcbcdbdad36b265eee92fcda278c8b0f10e5b7ad1dda7d2c0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.9.0
+- FEATURE: input log now uses devices name as file, instead of string from config (by @skoef)
+- FEATURE: Dell Networkign OS (dnos) support (by @erefre)
+- BUGFIX: CiscoSMB, powerconnect, comware, xos, ironware, nos fixes
+
 # 0.8.1
 - BUGFIX: restore ruby 1.9.3 compatibility
 

data/README.md

@@ -63,6 +63,7 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
  * DELL PowerConnect
  * Extreme Networks XOS
  * Force10 FTOS
+ * Force10 NDOS
  * FortiGate FortiOS
  * HP Comware (HP A-series, H3C, 3Com)
  * HP ProCurve
@@ -353,6 +354,20 @@ nodiff/$FQDN--show_version
 nodiff/$FQDN--show_inventory
 ```
 
+### RESTful API and Web Interface
+
+The RESTful API and Web Interface is enabled by configuring the `rest:` parameter in the config file.  This parameter can optionally contain a relative URI.
+
+```
+# Listen on http://127.0.0.1:8888/
+rest: 127.0.0.1:8888
+```
+
+```
+# Listen on http://10.0.0.1:8000/oxidized/
+rest: 10.0.0.1:8000/oxidized
+```
+
 ### Advanced Configuration
 
 Below is an advanced example configuration. You will be able to (optinally) override options per device. The router.db format used is ```hostname:model:username:password:enable_password```. Hostname and model will be the only required options, all others override the global configuration sections.

data/extra/syslog.rb

@@ -54,6 +54,8 @@ module Oxidized
     MSG = {
       :ios   => /%SYS-(SW[0-9]+-)?5-CONFIG_I:/,
       :junos => 'UI_COMMIT:',
+      :eos   => /%SYS-5-CONFIG_I:/,
+      :nxos  => /%VSHD-5-VSHD_SYSLOG_CONFIG_I:/,
     }
 
     class << self

data/lib/oxidized/input/ftp.rb

@@ -18,7 +18,7 @@ module Oxidized
     def connect node
       @node       = node
       @node.model.cfg['ftp'].each { |cb| instance_exec(&cb) }
-      @log = File.open(CFG.input.debug?.to_s + '-ftp', 'w') if CFG.input.debug?
+      @log = File.open(Oxidized::Config::Crash + "-#{@node.ip}-ftp", 'w') if CFG.input.debug?
       @ftp = Net::FTP.new @node.ip, @node.auth[:username], @node.auth[:password]
       connected?
     end

data/lib/oxidized/input/ssh.rb

@@ -20,7 +20,7 @@ module Oxidized
       @output     = ''
       @node.model.cfg['ssh'].each { |cb| instance_exec(&cb) }
       secure = CFG.input.ssh.secure
-      @log = File.open(CFG.input.debug?.to_s + '-ssh', 'w') if CFG.input.debug?
+      @log = File.open(Oxidized::Config::Crash + "-#{@node.ip}-ssh", 'w') if CFG.input.debug?
       port = vars(:ssh_port) || 22
       @ssh = Net::SSH.start @node.ip, @node.auth[:username], :port => port.to_i,
                             :password => @node.auth[:password], :timeout => CFG.timeout,

data/lib/oxidized/input/telnet.rb

@@ -16,11 +16,13 @@ module Oxidized
               'Port'    => port.to_i,
               'Timeout' => @timeout,
               'Model'   => @node.model }
-      opt['Output_log'] = CFG.input.debug?.to_s + '-telnet' if CFG.input.debug?
+      opt['Output_log'] = Oxidized::Config::Crash + "-#{@node.ip}-telnet" if CFG.input.debug?
 
       @telnet  = Net::Telnet.new opt
-      expect username
-      @telnet.puts @node.auth[:username]
+      if @node.auth[:username] and @node.auth[:username].length > 0
+        expect username
+        @telnet.puts @node.auth[:username]
+      end
       expect password
       @telnet.puts @node.auth[:password]
       begin

data/lib/oxidized/model/asa.rb

@@ -23,16 +23,16 @@ class ASA < Oxidized::Model
     comment cfg
   end
 
+  cmd 'show inventory' do |cfg|
+    comment cfg
+  end
+
   cmd 'more system:running-config' do |cfg|
     cfg = cfg.each_line.to_a[3..-1].join
     cfg.gsub! /^: [^\n]*\n/, ''
     cfg
   end
 
-  cmd 'show inventory' do |cfg|
-    comment cfg
-  end
-
   cfg :ssh do
     if vars :enable
       post_login do

data/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

data/lib/oxidized/model/ciscosmb.rb

@@ -23,10 +23,6 @@ class CiscoSMB < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show inventory' do |cfg|
-    comment cfg
-  end
-
   cmd 'show running-config' do |cfg|
     cfg = cfg.each_line.to_a[0..-1].join
     cfg.gsub! /^Current configuration : [^\n]*\n/, ''

data/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
@@ -38,7 +39,7 @@ class Comware < Oxidized::Model
   end
 
   cmd 'display version' do |cfg|
-    cfg = cfg.each_line.select {|l| not l.match /uptime/ }.join
+    cfg = cfg.each_line.select {|l| not l.match /uptime/i }.join
     comment cfg
   end
 

data/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

data/lib/oxidized/model/ironware.rb

@@ -16,12 +16,9 @@ class IronWare < Oxidized::Model
   #end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
-  end
-
-  cmd 'show running-config' do |cfg|
-    cfg = cfg.each_line.to_a[3..-1].join
-    cfg
+    # 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|
@@ -36,7 +33,7 @@ class IronWare < Oxidized::Model
     cfg.gsub! /(^((.*)Current temp(.*))$)/, '' #remove unwanted lines current temperature
     cfg.gsub! /Speed = [A-Z]{3} \(\d{2}\%\)/, '' #remove unwanted lines Speed Fans
     cfg.gsub! /current speed is [A-Z]{3} \(\d{2}\%\)/, ''
-    cfg.gsub! /Fan controlled temperature: \d{2}\.\d deg-C/, 'Fan controlled temperature: XX.X d deg-C'
+    cfg.gsub! /\d{2}\.\d deg-C/, 'XX.X deg-C'
     if cfg.include? "TEMPERATURE"
       sc = StringScanner.new cfg
       out = ''
@@ -55,20 +52,28 @@ class IronWare < Oxidized::Model
   end
   
   cmd 'show module' do |cfg|
+    cfg.gsub! /^((Invalid input)|(Type \?)).*$/, '' # some ironware devices are fixed config
     comment cfg
   end
 
+  cmd 'show running-config' do |cfg|
+    arr = cfg.each_line.to_a
+    arr[2..-1].join unless arr.length < 2
+  end
+
   cfg :telnet do
-    username /^Username:/
-    password /^Password:/
+    # match expected prompts on both older and newer
+    # versions of IronWare
+    username /^(Please Enter Login Name|Username):/
+    password /^(Please Enter )Password:/
   end
 
   #handle pager with enable
   cfg :telnet, :ssh do
     if vars :enable
       post_login do
-        send "enable\n"
-        send vars(:enable) + "\n"
+        send "enable\r\n"
+        send vars(:enable) + "\r\n"
       end
     end
     post_login ''
@@ -79,4 +84,4 @@ class IronWare < Oxidized::Model
     pre_logout 'exit'
   end
 
-end
+end

data/lib/oxidized/model/junos.rb

@@ -9,7 +9,7 @@ class JunOS < Oxidized::Model
   cmd :all do |cfg|
     # we don't need screen-scraping in ssh due to exec
     cfg = cfg.lines.to_a[1..-2].join if telnet
-    cfg.lines.map { |line| line.rstrip }.join "\n"
+    cfg.lines.map { |line| line.rstrip }.join("\n") + "\n"
   end
 
   cmd :secret do |cfg| 

data/lib/oxidized/model/nos.rb

@@ -26,7 +26,7 @@ class NOS < Oxidized::Model
   end
 
   cfg 'show system' do |cfg|
-    commen cfg.each_line.reject { |line| line.match /Time/ or line.match /speed/ }
+    comment cfg.each_line.reject { |line| line.match /Time/ or line.match /speed/ }
   end
 
   cmd 'show running-config'

data/lib/oxidized/model/powerconnect.rb

@@ -25,7 +25,7 @@ class PowerConnect < Oxidized::Model
 
   cmd 'show running-config'
 
-  cfg :telnet do
+  cfg :telnet, :ssh do
     username /^User( Name)?:/
     password /^\r?Password:/
   end

data/lib/oxidized/model/xos.rb

@@ -6,7 +6,9 @@ class XOS < Oxidized::Model
   comment  '# '
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-2].join
+    # xos inserts leading \r characters and other trailing white space.
+    # this deletes extraneous \r and trailing white space.
+    cfg.each_line.to_a[1..-2].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
   end
 
   cmd 'show version' do |cfg|
@@ -35,6 +37,7 @@ class XOS < Oxidized::Model
   cfg :telnet, :ssh do
     post_login 'disable clipaging'
     pre_logout 'exit'
+    pre_logout 'n'
   end
 
 end

data/oxidized.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized'
-  s.version           = '0.8.1'
+  s.version           = '0.9.0'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti', 'Samer Abdel-Hafez', 'Anton Aksola' ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -136,9 +136,11 @@ files:
 - lib/oxidized/model/aos7.rb
 - lib/oxidized/model/aosw.rb
 - lib/oxidized/model/asa.rb
+- lib/oxidized/model/c4cmts.rb
 - lib/oxidized/model/ciscosmb.rb
 - lib/oxidized/model/comware.rb
 - lib/oxidized/model/cumulus.rb
+- lib/oxidized/model/dnos.rb
 - lib/oxidized/model/edgeos.rb
 - lib/oxidized/model/eos.rb
 - lib/oxidized/model/fabricos.rb