oxidized 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cac94f37298a23f89c92bcb0448a3b3743174dc5
-  data.tar.gz: bd8bb309b4312f7d93f59b4125322fe57357ff80
+  metadata.gz: cfbcf124c9f12166a20cf549f684d7b6b5edb3ab
+  data.tar.gz: 9a317c8cc4dd290297ac00cf4888b855b1f10303
 SHA512:
-  metadata.gz: 85e95475ba8f626a95d45aa7c7cd2d2eed8cafbb576a334e355a3b588238905104d773056a7e51258d953d41035901e55540080cdae098658222c7bf4bf00d42
-  data.tar.gz: 0c2402aadad2f6564683713cad70006a9ad52cbe1bdb7697f259dd56339618e25c168ef7286f4ea96f697dde26e80c76fa54bfbc58fa43cb5c0667f844d73284
+  metadata.gz: 2ad3cf531b7be26691abe59a8581be106c07b5a039c5eafec5dae3f170b28e9d7d3f8bb45cfe4516787604ddddec27b52d9ac55644e7c64ba11ffb4601e03d54
+  data.tar.gz: 72ad3d8512564340980e742c98f70977ffc8b5f9b5212a44b194f116afd1b3915f9348df9b066a531ce89ce67313ebceb44e816ed7dad4dcb36aa50820763955

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 0.2.3
+- BUGFIX: rescue @ssh.close when far end closes disgracefully (ALU ISAM)
+- BUGFIX: bugfixes to models
+- FEATURE: Alcatel-Lucent ISAM 7302/7330 model added by @jalmargyyk
+- FEATURE: Huawei VRP model added by @jalmargyyk
+- FEATURE: Ubiquiti AirOS added by @willglyn
+- FEATURE: Support 'input' debug in config, ssh/telnet use it to write session log
+
 # 0.2.2
 - BUGFIX: mark node as failure if unknown error is raised
 

data/README.md

@@ -11,6 +11,7 @@
 # Supported OS types
 
  * A10 Networks ACOS
+ * Alcatel-Lucent ISAM 7302/7330
  * Alcatel-Lucent Operating System AOS
  * Alcatel-Lucent Operating System AOS7
  * Alcatel-Lucent Operating System Wireless
@@ -18,6 +19,7 @@
  * Arista EOS
  * Brocade Fabric OS
  * Brocade Ironware
+ * Brocade Vyatta
  * Cisco AireOS
  * Cisco ASA
  * Cisco IOS
@@ -26,7 +28,10 @@
  * Force10 FTOS
  * FortiGate FortiOS
  * HP ProCurve
+ * Huawei VRP
  * Juniper JunOS
+ * Juniper ScreenOS (Netscreen)
+ * Ubiquiti AirOS
 
 # Install
 

data/lib/oxidized/config.rb

@@ -29,7 +29,8 @@ module Oxidized
   CFGS.default.vars          = {}             # could be 'enable'=>'enablePW'
   CFGS.default.groups        = {}             # group level configuration
 
-  CFGS.default.input.default = 'ssh, telnet'
+  CFGS.default.input.default    = 'ssh, telnet'
+  CFGS.default.input.debug      = false # or String for session log file
   CFGS.default.input.ssh.secure = false # complain about changed certs
 
   CFGS.default.output.default = 'file'  # file, git

data/lib/oxidized/input/ssh.rb

@@ -20,6 +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?
       @ssh = Net::SSH.start @node.ip, @node.auth[:username],
                             :password => @node.auth[:password], :timeout => CFG.timeout,
                             :paranoid => secure
@@ -59,12 +60,14 @@ module Oxidized
       Timeout::timeout(CFG.timeout) { @ssh.loop }
     rescue Errno::ECONNRESET, Net::SSH::Disconnect, IOError
     ensure
-      @ssh.close if not @ssh.closed?
+      @log.close if CFG.input.debug?
+      (@ssh.close rescue true) unless @ssh.closed?
     end
 
     def shell_open ssh
       @ses = ssh.open_channel do |ch|
         ch.on_data do |_ch, data|
+          @log.print data if CFG.input.debug?
           @output << data
           @output = @node.model.expects @output
         end

data/lib/oxidized/input/telnet.rb

@@ -10,8 +10,12 @@ module Oxidized
       @node    = node
       @timeout = CFG.timeout
       @node.model.cfg['telnet'].each { |cb| instance_exec(&cb) }
-      @telnet  = Net::Telnet.new 'Host' => @node.ip, 'Timeout' => @timeout,
-                                 'Model' => @node.model
+
+      opt = { 'Host' => @node.ip, 'Timeout' => @timeout,
+              'Model' => @node.model }
+      opt['Output_log'] = CFG.input.debug?.to_s + '-telnet' if CFG.input.debug?
+
+      @telnet  = Net::Telnet.new opt
       expect username
       @telnet.puts @node.auth[:username]
       expect password

data/lib/oxidized/model/airos.rb

@@ -0,0 +1,20 @@
+class Airos < Oxidized::Model
+  # Ubiquiti AirOS circa 5.x
+  
+  prompt /^[^#]+# /
+  
+  cmd 'cat /etc/board.info' do |cfg|
+    cfg.split("\n").map { |line| "# #{line}" }.join("\n") + "\n"
+  end
+  
+  cmd 'cat /tmp/system.cfg'
+  
+  cmd :secret do |cfg|
+    cfg.gsub! /^(users\.\d+\.password|snmp\.community)=.+/, "# \\1=<hidden>"
+    cfg
+  end
+
+  cfg :ssh do
+    exec true
+  end
+end

data/lib/oxidized/model/ios.rb

@@ -28,6 +28,10 @@ class IOS < Oxidized::Model
     cfg
   end
 
+  cmd 'show version' do |cfg|
+    comment cfg.lines.first
+  end
+
   cmd 'show inventory' do |cfg|
     comment cfg
   end

data/lib/oxidized/model/iosxr.rb

@@ -2,6 +2,7 @@ class IOSXR < Oxidized::Model
 
   # IOS XR model #
 
+  prompt /^([\w.@:\/-]+[#>]\s?)$/
   comment  '! '
 
   cmd :all do |cfg|

data/lib/oxidized/model/ironware.rb

@@ -26,7 +26,7 @@ class IronWare < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
-    post_login 'terminal length 0'
+    post_login 'skip-page-display'
     pre_logout 'exit'
   end
 

data/lib/oxidized/model/isam.rb

@@ -0,0 +1,35 @@
+class ISAM < Oxidized::Model
+  #Alcatel ISAM 7302/7330 FTTN
+  
+  prompt /^([\w.:@-]+>#\s)$/
+  comment '# '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cfg :telnet do 
+    username /^login:\s*/
+    password /^password:\s*/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'environment prompt "%n># "'
+    post_login 'environment mode batch'
+    post_login 'environment inhibit-alarms print no-more'
+    pre_logout 'logout'
+  end
+  
+  cmd 'show software-mngt oswp detail' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show equipment slot detail' do |cfg|
+    comment cfg
+  end
+
+  cmd 'info configure flat' do |cfg|
+    cfg
+  end
+
+end

data/lib/oxidized/model/junos.rb

@@ -18,7 +18,7 @@ class JunOS < Oxidized::Model
     cfg
   end
 
-  cmd 'show configuration'
+  cmd 'show configuration | display omit'
 
   cmd 'show version' do |cfg|
     @model = $1 if cfg.match /^Model: (\S+)/

data/lib/oxidized/model/powerconnect.rb

@@ -19,7 +19,7 @@ class PowerConnect < Oxidized::Model
 
   cmd 'show system' do |cfg|
     cfg = cfg.each_line.take_while { |line| not line.match(/uptime/i) }
-    comment cfg
+    comment cfg.join "\n"
   end
 
   cmd 'show running-config'
@@ -30,9 +30,14 @@ class PowerConnect < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
-    post_login 'terminal datadump'
-    post_login 'enable'
-    pre_logout 'exit'
+    if vars :enable
+      send "enable\n"
+      send vars(:enable) + "\n"
+    end
+
+    post_login "terminal length 0"
+    pre_logout "logout"
+    
   end
 
 end

data/lib/oxidized/model/procurve.rb

@@ -27,6 +27,7 @@ class Procurve < Oxidized::Model
   end
 
   cmd 'show system-information' do |cfg|
+    cfg = cfg.split("\n")[0..-8].join("\n")
     comment cfg
   end
 

data/lib/oxidized/model/vrp.rb

@@ -0,0 +1,34 @@
+class VRP < Oxidized::Model
+  # Huawei VRP
+  
+  prompt /^(<[\w.-]+>)$/
+  comment '# '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+ 
+  cfg :telnet do
+    username /^Username:$/
+    password /^Password:$/
+  end
+
+  cfg :telnet, :ssh do 
+    post_login 'screen-length 0 temporary'
+    pre_logout 'quit'
+  end
+
+  cmd 'display version' do |cfg|
+    cfg = cfg.each_line.select {|l| not l.match /uptime/ }.join
+    comment cfg
+  end
+
+  cmd 'display device' do |cfg|
+    comment cfg
+  end
+
+  cmd 'display current-configuration all' do |cfg|
+    cfg
+  end
+  
+end

data/lib/oxidized/output/git.rb

@@ -1,6 +1,7 @@
 module Oxidized
 class Git < Output
   begin
+    gem 'rugged', '~> 0.21.0'
     require 'rugged'
   rescue LoadError
     raise OxidizedError, 'rugged not found: sudo gem install rugged'

data/oxidized.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized'
-  s.version           = '0.2.2'
+  s.version           = '0.2.3'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -83,6 +83,7 @@ files:
 - lib/oxidized/manager.rb
 - lib/oxidized/model/acos.rb
 - lib/oxidized/model/aireos.rb
+- lib/oxidized/model/airos.rb
 - lib/oxidized/model/aos.rb
 - lib/oxidized/model/aos7.rb
 - lib/oxidized/model/aosw.rb
@@ -94,12 +95,14 @@ files:
 - lib/oxidized/model/ios.rb
 - lib/oxidized/model/iosxr.rb
 - lib/oxidized/model/ironware.rb
+- lib/oxidized/model/isam.rb
 - lib/oxidized/model/junos.rb
 - lib/oxidized/model/model.rb
 - lib/oxidized/model/powerconnect.rb
 - lib/oxidized/model/procurve.rb
 - lib/oxidized/model/screenos.rb
 - lib/oxidized/model/timos.rb
+- lib/oxidized/model/vrp.rb
 - lib/oxidized/model/vyatta.rb
 - lib/oxidized/node.rb
 - lib/oxidized/node/stats.rb