oxidized 0.20.0 → 0.21.0

data/lib/oxidized/model/ucs.rb

@@ -0,0 +1,31 @@
+class UCS < Oxidized::Model
+
+  prompt /^(\r?[\w.@_()-]+[#]\s?)$/
+  comment '! '
+
+  cmd 'show version brief' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show chassis detail' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show fabric-interconnect detail' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show configuration all | no-more' do |cfg|
+    cfg
+  end
+
+  cfg :ssh, :telnet do
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+  end
+
+  cfg :telnet do
+    username /^login:/
+    password /^Password:/
+  end
+end

data/lib/oxidized/model/voss.rb

@@ -1,22 +1,31 @@
 class Voss < Oxidized::Model
   # Avaya VSP Operating System Software(VOSS)
   # Created by danielcoxman@gmail.com
-  # May 9, 2017
+  # May 25, 2017
   # This was tested on vsp4k and vsp8k
 
   comment '# '
 
   prompt /^[^\s#>]+[#>]$/
 
+  # needed for proper formatting after post_login
+  cmd('') { |cfg| comment "#{cfg}\n" }
+  
+  # Get sys-info and remove information that changes such has temperature and power
   cmd 'show sys-info' do |cfg|
-    comment cfg
+    cfg.gsub! /(^((.*)SysUpTime(.*))$)/, 'removed SysUpTime'
+    cfg.gsub! /^((.*)Temperature Info \:(.*\r?\n){4})/, 'removed Temperature Info and 3 more lines'
+    cfg.gsub! /(^((.*)AmbientTemperature(.*)\:(.*))$)/, 'removed AmbientTemperature'
+    cfg.gsub! /(^((.*)Temperature(.*)\:(.*))$)/, 'removed Temperature'
+    cfg.gsub! /(^((.*)Total Power Usage(.*)\:(.*))$)/, 'removed Total Power Usage'
+    comment "#{cfg}\n"
   end
 
   # more the config rather than doing a show run
   cmd 'more config.cfg' do |cfg|
     cfg
     cfg.gsub! /^[^\s#>]+[#>]$/, ''
-    cfg.gsub! /^more config.cfg/, ''
+    cfg.gsub! /^more config.cfg/, '# more config.cfg'
   end
 
   cfg :telnet do

data/lib/oxidized/model/vrp.rb

@@ -4,6 +4,12 @@ class VRP < Oxidized::Model
   prompt /^(<[\w.-]+>)$/
   comment '# '
 
+  cmd :secret do |cfg|
+    cfg.gsub! /(pin verify (?:auto|)).*/, '\\1 <PIN hidden>'
+    cfg.gsub! /(%\^%#.*%\^%#)/, '<secret hidden>'
+    cfg
+  end
+
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-2].join
   end

data/lib/oxidized/model/weos.rb

@@ -0,0 +1,22 @@
+class WEOS < Oxidized::Model
+
+  #Westell WEOS, works with Westell 8178G, Westell 8266G
+
+  prompt /^(\s[\w.@-]+[#>]\s?)$/
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd 'show running-config' do |cfg|
+    cfg
+  end
+
+  cfg :telnet do
+    username /login:/
+    password /assword:/
+    post_login 'cli more disable'
+    pre_logout 'logout'
+  end
+
+end

data/lib/oxidized/model/xos.rb

@@ -29,6 +29,10 @@ class XOS < Oxidized::Model
 
   cmd 'show configuration'
 
+  cmd 'show policy detail' do |cfg|
+    comment cfg
+  end
+
   cfg :telnet do
     username /^login:/
     password /^\r*password:/

data/lib/oxidized/node.rb

@@ -6,8 +6,9 @@ module Oxidized
   class ModelNotFound  < OxidizedError; end
   class Node
     attr_reader :name, :ip, :model, :input, :output, :group, :auth, :prompt, :vars, :last, :repo
-    attr_accessor :running, :user, :msg, :from, :stats, :retry
+    attr_accessor :running, :user, :email, :msg, :from, :stats, :retry
     alias :running? :running
+
     def initialize opt
       Oxidized.logger.debug 'resolving DNS for %s...' % opt[:name]
       # remove the prefix if an IP Address is provided with one as IPAddr converts it to a network address.
@@ -120,7 +121,7 @@ module Oxidized
     end
 
     def reset
-      @user = @msg = @from = nil
+      @user = @email = @msg = @from = nil
       @retry = 0
     end
 
@@ -217,6 +218,7 @@ module Oxidized
       end
 
       #model
+      # FIXME: warning: instance variable @model not initialized
       if Oxidized.config.models.has_key?(@model.class.name.to_s.downcase)
         if Oxidized.config.models[@model.class.name.to_s.downcase].has_key?(key_str)
           value = Oxidized.config.models[@model.class.name.to_s.downcase][key_str]

data/lib/oxidized/nodes.rb

@@ -68,6 +68,7 @@ module Oxidized
         with_lock do
           n = del node
           n.user = opt['user']
+          n.email = opt['email']
           n.msg  = opt['msg']
           n.from = opt['from']
           # set last job to nil so that the node is picked for immediate update

data/lib/oxidized/version.rb

@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.20.0'
+  VERSION = '0.21.0'
 end

data/lib/oxidized/worker.rb

@@ -3,6 +3,7 @@ module Oxidized
   require 'oxidized/jobs'
   class Worker
     def initialize nodes
+      @jobs_done  = 0
       @nodes      = nodes
       @jobs       = Jobs.new(Oxidized.config.threads, Oxidized.config.interval, @nodes)
       @nodes.jobs = @jobs
@@ -14,8 +15,9 @@ module Oxidized
       @jobs.delete_if { |job| ended << job if not job.alive? }
       ended.each      { |job| process job }
       @jobs.work
+
       while @jobs.size < @jobs.want
-        Oxidized.logger.debug "lib/oxidized/worker.rb: Jobs #{@jobs.size}, Want: #{@jobs.want}"
+        Oxidized.logger.debug "lib/oxidized/worker.rb: Jobs running: #{@jobs.size} of #{@jobs.want} - ended: #{@jobs_done} of #{@nodes.size}"
         # ask for next node in queue non destructive way
         nextnode = @nodes.first
         unless nextnode.last.nil?
@@ -29,6 +31,8 @@ module Oxidized
         @jobs.push Job.new node
         Oxidized.logger.debug "lib/oxidized/worker.rb: Added #{node.name} to the job queue"
       end
+
+      run_done_hook if is_cycle_finished?
       Oxidized.logger.debug("lib/oxidized/worker.rb: #{@jobs.size} jobs running in parallel") unless @jobs.empty?
     end
 
@@ -38,6 +42,8 @@ module Oxidized
       node.stats.add job
       @jobs.duration job.time
       node.running = false
+      @jobs_done += 1 # needed for worker_done event
+
       if job.status == :success
         Oxidized.Hooks.handle :node_success, :node => node,
                                              :job => job
@@ -46,7 +52,7 @@ module Oxidized
         msg += " with message '#{node.msg}'" if node.msg
         output = node.output.new
         if output.store node.name, job.config,
-                              :msg => msg, :user => node.user, :group => node.group
+                              :msg => msg, :email => node.email, :user => node.user, :group => node.group
           Oxidized.logger.info "Configuration updated for #{node.group}/#{node.name}"
           Oxidized.Hooks.handle :post_store, :node => node,
                                              :job => job,
@@ -71,5 +77,20 @@ module Oxidized
       Oxidized.logger.warn "#{node.name} not found, removed while collecting?"
     end
 
+    private
+
+    def is_cycle_finished?
+      @jobs_done > 0 && @jobs_done % @nodes.count == 0
+    end
+
+    def run_done_hook
+      Oxidized.logger.debug "lib/oxidized/worker.rb: Running :nodes_done hook"
+      Oxidized.Hooks.handle :nodes_done
+    rescue => e
+      # swallow the hook erros and continue as normal
+      Oxidized.logger.error "lib/oxidized/worker.rb: #{e.message}"
+    ensure
+      @jobs_done = 0
+    end
   end
 end

data/oxidized.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.required_ruby_version =           '>= 2.0.0'
   s.add_runtime_dependency 'asetus',  '~> 0.1'
   s.add_runtime_dependency 'slop',    '~> 3.5'
-  s.add_runtime_dependency 'net-ssh', '~> 3.0.2'
+  s.add_runtime_dependency 'net-ssh', '~> 4.1.0'
   s.add_runtime_dependency 'rugged',  '~> 0.21',  '>= 0.21.4'
 
   if defined?(RUBY_VERSION) && RUBY_VERSION > '2.3'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -10,166 +10,152 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-14 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.21'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.21.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.21'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.21.4
-- !ruby/object:Gem::Dependency
-  name: net-telnet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.8'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1'
 description: software to fetch configuration from network devices and store them
@@ -182,9 +168,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-version"
-- ".travis.yml"
+- .gitignore
+- .ruby-version
+- .travis.yml
 - CHANGELOG.md
 - Dockerfile
 - Gemfile
@@ -194,9 +180,17 @@ files:
 - TODO.md
 - bin/console
 - bin/oxidized
+- docs/Configuration.md
+- docs/Hooks.md
+- docs/Outputs.md
+- docs/Ruby-API.md
+- docs/Sources.md
+- docs/Supported-OS-Types.md
+- docs/VRP-Huawei.md
 - extra/auto-reload-config.runit
 - extra/nagios_check_failing_nodes.rb
 - extra/oxidized-report-git-commits
+- extra/oxidized-ubuntu.haproxy
 - extra/oxidized.apache2
 - extra/oxidized.init
 - extra/oxidized.init.d
@@ -230,22 +224,30 @@ files:
 - lib/oxidized/jobs.rb
 - lib/oxidized/manager.rb
 - lib/oxidized/model/acos.rb
+- lib/oxidized/model/acsw.rb
+- lib/oxidized/model/aen.rb
 - lib/oxidized/model/aireos.rb
 - lib/oxidized/model/airos.rb
+- lib/oxidized/model/alteonos.rb
 - lib/oxidized/model/alvarion.rb
 - lib/oxidized/model/aos.rb
 - lib/oxidized/model/aos7.rb
 - lib/oxidized/model/aosw.rb
 - lib/oxidized/model/apc_aos.rb
 - lib/oxidized/model/asa.rb
+- lib/oxidized/model/asyncos.rb
+- lib/oxidized/model/audiocodes.rb
+- lib/oxidized/model/boss.rb
 - lib/oxidized/model/br6910.rb
 - lib/oxidized/model/c4cmts.rb
 - lib/oxidized/model/casa.rb
 - lib/oxidized/model/catos.rb
 - lib/oxidized/model/cisconga.rb
+- lib/oxidized/model/ciscosma.rb
 - lib/oxidized/model/ciscosmb.rb
 - lib/oxidized/model/comware.rb
 - lib/oxidized/model/coriant8600.rb
+- lib/oxidized/model/coriantgroove.rb
 - lib/oxidized/model/corianttmos.rb
 - lib/oxidized/model/cumulus.rb
 - lib/oxidized/model/datacom.rb
@@ -253,6 +255,7 @@ files:
 - lib/oxidized/model/dnos.rb
 - lib/oxidized/model/edgeos.rb
 - lib/oxidized/model/edgeswitch.rb
+- lib/oxidized/model/enterasys.rb
 - lib/oxidized/model/eos.rb
 - lib/oxidized/model/fabricos.rb
 - lib/oxidized/model/fiberdriver.rb
@@ -262,7 +265,9 @@ files:
 - lib/oxidized/model/fujitsupy.rb
 - lib/oxidized/model/gaiaos.rb
 - lib/oxidized/model/hatteras.rb
+- lib/oxidized/model/hirschmann.rb
 - lib/oxidized/model/hpebladesystem.rb
+- lib/oxidized/model/hpemsa.rb
 - lib/oxidized/model/ios.rb
 - lib/oxidized/model/iosxr.rb
 - lib/oxidized/model/ipos.rb
@@ -290,16 +295,19 @@ files:
 - lib/oxidized/model/routeros.rb
 - lib/oxidized/model/saos.rb
 - lib/oxidized/model/screenos.rb
+- lib/oxidized/model/sgos.rb
 - lib/oxidized/model/siklu.rb
 - lib/oxidized/model/supermicro.rb
 - lib/oxidized/model/timos.rb
 - lib/oxidized/model/tmos.rb
 - lib/oxidized/model/tplink.rb
 - lib/oxidized/model/trango.rb
+- lib/oxidized/model/ucs.rb
 - lib/oxidized/model/voltaire.rb
 - lib/oxidized/model/voss.rb
 - lib/oxidized/model/vrp.rb
 - lib/oxidized/model/vyatta.rb
+- lib/oxidized/model/weos.rb
 - lib/oxidized/model/xos.rb
 - lib/oxidized/model/zhoneolt.rb
 - lib/oxidized/model/zynos.rb
@@ -329,17 +337,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: oxidized
-rubygems_version: 2.5.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: feeble attempt at rancid