oxidized 0.16.3 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cba5f31454c2e6512d70c1688f81885e82a97ad9
-  data.tar.gz: 40b8dfe37843039c8fef5cedc443a7101c78ffa1
+  metadata.gz: 4293285f8095f28f9f3d38dc2d606a03a58d163b
+  data.tar.gz: f108592ebdce488d10f06d7ee0e5545e3e117e32
 SHA512:
-  metadata.gz: 8ca49b2ed227d5526c2d2093c794fd67a796822f7aeb30966060ac7ff46d12446b7c54fc6438b9e54e57d442422d92dccfaf5483e71141de066dfeda5d2726cc
-  data.tar.gz: 2df84d9068fcdebd9c633d627a189ea5eaf915c9e04dc00af03b372dfba944c5ad8e1e0508ab93968295136d69a892b9098dbcc0218e2880558bfccf04bbb119
+  metadata.gz: aed22b16c6223c5b27a6b68476e25aea4154fcafd104a8567f7f19c4de38c8dddcd3fe18e1fd0950bc6e01e927d6af2fed514dd8f966eb33670f2a3517c6285f
+  data.tar.gz: 62a21f8caa39a27c853d2d56b3b96d35f6320db5cf6743ea76dd0cb7c6562729a0b96b5cc9b83524ad6edaac960dfb07ab88c7bffa526b459248603ba0e71bfa

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0 17.3
+- FEATURE: "nil", "false" and "true" in source (e.g. router.db) are interpeted as nil, false, true. Empty is now always considered empty string, instead of in some cases nil and some cases empty string.
+- FEATURE: support tftp as input model (@MajesticFalcon)
+- FEATURE: add alvarion model (@MajesticFalcon)
+- FEATURE: detect if ssh wants password terminal/CLI prompt or not
+- FEATURE: node (group, model, username, password) resolution refactoring, supports wider range of use-cases
+- BUGFIX: fetch for file output (@danilopopeye)
+- BUGFIX: net-ssh version specification
+- BUGFIX: routeros, catos, pfsense
+
 # 0.16.3
 - FEATURE: pfsense support (by @stokbaek)
 - BUGFIX: cumulus prompt not working with default switch configs (by @nertwork)

data/Dockerfile

@@ -3,7 +3,7 @@ MAINTAINER Samer Abdel-Hafez <sam@arahant.net>
 
 RUN add-apt-repository ppa:brightbox/ruby-ng && \
 	apt-get update && \
-  apt-get install -y ruby2.1 ruby2.1-dev libsqlite3-dev libssl-dev pkg-config make cmake
+  apt-get install -y ruby2.3 ruby2.3-dev libsqlite3-dev libssl-dev pkg-config make cmake
 
 RUN gem install oxidized oxidized-web --no-ri --no-rdoc
 

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    oxidized (0.14.3)
+    oxidized (0.17.0)
       asetus (~> 0.1)
-      net-ssh (>= 3.0.0, < 3.1)
+      net-ssh (~> 3.0.2)
+      net-telnet
       rugged (~> 0.21, >= 0.21.4)
       slop (~> 3.5)
 
@@ -14,16 +15,17 @@ GEM
     coderay (1.1.0)
     metaclass (0.0.4)
     method_source (0.8.2)
-    minitest (5.8.3)
+    minitest (5.9.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     net-ssh (3.0.2)
+    net-telnet (0.1.1)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rake (10.4.2)
-    rugged (0.24.0)
+    rake (10.5.0)
+    rugged (0.23.3)
     slop (3.6.0)
 
 PLATFORMS
@@ -38,4 +40,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.12.4
+   1.11.2

data/README.md

@@ -27,13 +27,16 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
     * [Privileged mode](#privileged-mode)
     * [Disabling SSH exec channels](#disabling-ssh-exec-channels)
     * [Source: CSV](#source-csv)
-    * [Source: SQLite](#source-sqlite)
+    * [Source: SQL](#source-sql)
+      * [Source: SQLite](#source-sqlite)
+      * [Source: Mysql](#source-mysql)
     * [Source: HTTP](#source-http)
     * [Output: GIT](#output-git)
     * [Output: HTTP](#output-http)
     * [Output: File](#output-file)
     * [Output types](#output-types)
     * [Advanced Configuration](#advanced-configuration)
+    * [Advanced Group Configuration](#advanced-group-configuration)
 7. [Ruby API](#ruby-api)
     * [Input](#input)
     * [Output](#output)
@@ -41,99 +44,103 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
     * [Model](#model)
 
 # Supported OS types
+ * Vendor
+   * OS - model_name
 
  * A10 Networks
-   * ACOS
+   * ACOS - acos
  * Alcatel-Lucent
-   * AOS
-   * AOS7
-   * ISAM
+   * AOS - aos
+   * AOS7 - aos7
+   * ISAM - isam
    * Wireless
+ * Alvarion
+   * BreezeACCESS - alvarion
  * Arista
-   * EOS
+   * EOS - eos
  * Arris
-   * C4CMTS
+   * C4CMTS - c4cmts
  * Aruba
-   * AOSW
+   * AOSW - aosw
  * Brocade
-   * FabricOS
-   * Ironware
-   * NOS (Network Operating System)
-   * Vyatta
-   * 6910
+   * FabricOS - fabricos
+   * Ironware - ironware
+   * NOS (Network Operating System) - nos
+   * Vyatta - vyatta
+   * 6910 - br6910
  * Check Point
-   * GaiaOS
+   * GaiaOS - gaiaos
  * Ciena
-   * SOAS
+   * SOAS - saos
  * Cisco
-   * AireOS
-   * ASA
-   * CatOS
-   * IOS
-   * IOSXR
-   * NXOS
-   * SMB (Nikola series)
+   * AireOS - aireos
+   * ASA - asa
+   * CatOS - catos
+   * IOS - ios
+   * IOSXR - iosxr
+   * NXOS - nxos
+   * SMB (Nikola series) 
  * Citrix
-   * NetScaler (Virtual Applicance)
+   * NetScaler (Virtual Applicance) - netscaler
  * Coriant (former Tellabs)
-   * TMOS (8800)
-   * 8600
+   * TMOS (8800) - tmos
+   * 8600 - 
  * Cumulus
    * Linux
  * DataCom
    * DmSwitch 3000
  * DELL
-   * PowerConnect
-   * AOSW
+   * PowerConnect - powerconnect
+   * AOSW - aosw
  * Ericsson/Redback
-   * IPOS (former SEOS)
+   * IPOS (former SEOS) - ipos
  * Extreme Networks
-   * XOS
+   * XOS - xos
    * WM
  * F5
    * TMOS
  * Force10
-   * DNOS
-   * FTOS
+   * DNOS - dnos
+   * FTOS - ftos
  * FortiGate
-   * FortiOS
+   * FortiOS - fortios
  * HP
-   * Comware (HP A-series, H3C, 3Com)
-   * Procurve
+   * Comware (HP A-series, H3C, 3Com) - comware
+   * Procurve - procurve
  * Huawei
    * VRP
  * Juniper
    * JunOS
    * ScreenOS (Netscreen)
  * Mellanox
-   * MLNX-OS
+   * MLNX-OS - mlnxos
  * Mikrotik
-   * RouterOS
+   * RouterOS - routeros
  * Motorola
    * RFS
  * MRV
-   * MasterOS
+   * MasterOS - masteros
  * Netonix
-   * WISP Switch (As Netonix)
+   * WISP Switch (As Netonix) - netonix
  * Nokia (formerly TiMetra, Alcatel, Alcatel-Lucent)
-   * SR OS (TiMOS)
+   * SR OS (TiMOS) - timos
  * Opengear
-   * Opengear
+   * Opengear - opengear
  * Palo Alto
-   * PANOS
- * pfSense
+   * PANOS - panos
+ * pfSense - pfsense
  * Quanta
-   * Quanta / VxWorks 6.6 (1.1.0.8)
+   * Quanta / VxWorks 6.6 (1.1.0.8) - quantaos
  * Supermicro
-   * Supermicro
+   * Supermicro - supermicro
  * Ubiquiti
-   * AirOS
-   * Edgeos
-   * EdgeSwitch
+   * AirOS - airos
+   * Edgeos - edgeos
+   * EdgeSwitch - edgeswitch
  * Watchguard
-   * Fireware OS
+   * Fireware OS - firewareos
  * Zyxel
-   * ZyNOS
+   * ZyNOS - zynos
 
 
 # Installation
@@ -147,7 +154,7 @@ gem install oxidized-script oxidized-web # if you don't install oxidized-web, ma
 ```
 
 ## CentOS, Oracle Linux, Red Hat Linux
-On CentOS 6 / RHEL 6, install Ruby 1.9.3 or greater (for Ruby 2.1.2 installation instructions see "Installing Ruby 2.1.2 using RVM"), then install Oxidized dependencies
+On CentOS 6 / RHEL 6, install Ruby greater than 1.9.3 (for Ruby 2.1.2 installation instructions see "Installing Ruby 2.1.2 using RVM"), then install Oxidized dependencies
 ```shell
 yum install cmake sqlite-devel openssl-devel libssh2-devel
 ```
@@ -254,46 +261,54 @@ rvm use --default 2.1.2
 ```
 
 # Running with Docker
-1. clone git repo:
+
+clone git repo:
 
 ```
-    root@bla:~# git clone https://github.com/ytti/oxidized
-```
-2. build container locally:
+git clone https://github.com/ytti/oxidized
 ```
-    root@bla:~# docker build -q -t oxidized/oxidized:latest oxidized/
+
+build container locally:
+
 ```
-3. create config directory in main system:
+docker build -q -t oxidized/oxidized:latest oxidized/
 ```
-    root@bla~:# mkdir /etc/oxidized
+
+create config directory in main system:
+
 ```
-4. run container the first time:
+mkdir /etc/oxidized
 ```
-    root@bla:~# docker run -v /etc/oxidized:/root/.config/oxidized -p 8888:8888/tcp -t oxidized/oxidized:latest oxidized
+
+run container the first time:
+_Note: this step in only needed for creating Oxidized's configuration file and can be skipped if you already have it
+
 ```
-5. add 'router.db' to /etc/oxidized:
+docker run --rm -v /etc/oxidized:/root/.config/oxidized -p 8888:8888/tcp -t oxidized/oxidized:latest oxidized
 ```
-    root@bla:~# vim /etc/oxidized/router.db
-    [ ... ]
-    root@bla:~#
+
+create the `/etc/oxidized/router.db`
+
 ```
-6. run container again:
+vim /etc/oxidized/router.db
 ```
-    root@bla:~# docker run -v /etc/oxidized:/root/.config/oxidized -p 8888:8888/tcp -t oxidized/oxidized:latest
-    oxidized[1]: Oxidized starting, running as pid 1
-    oxidized[1]: Loaded 1 nodes
-    Puma 2.13.4 starting...
-    * Min threads: 0, max threads: 16
-    * Environment: development
-    * Listening on tcp://0.0.0.0:8888
-    ^C
 
-    root@bla:~#
+run container again:
+
+```
+docker run -v /etc/oxidized:/root/.config/oxidized -p 8888:8888/tcp -t oxidized/oxidized:latest
+oxidized[1]: Oxidized starting, running as pid 1
+oxidized[1]: Loaded 1 nodes
+Puma 2.13.4 starting...
+* Min threads: 0, max threads: 16
+* Environment: development
+* Listening on tcp://0.0.0.0:8888
 ```
 
 If you want to have the config automatically reloaded (e.g. when using a http source that changes)
+
 ```
-    root@bla:~# docker run -v /etc/oxidized:/root/.config/oxidized -p 8888:8888/tcp -e CONFIG_RELOAD_INTERVAL=3600 -t oxidized/oxidized:latest
+docker run -v /etc/oxidized:/root/.config/oxidized -p 8888:8888/tcp -e CONFIG_RELOAD_INTERVAL=3600 -t oxidized/oxidized:latest
 ```
 
 ## Cookbook
@@ -386,6 +401,31 @@ vars_map:
   ssh_proxy: 3
 ...
 ```
+### Source: SQL
+ Oxidized uses the `sequel` ruby gem. You can use a variety of databases that aren't explicitly listed. For more information visit https://github.com/jeremyevans/sequel Make sure you have the correct adapter!
+### Source: MYSQL
+
+```sudo apt-get install libmysqlclient-dev```
+
+The values correspond to your fields in the DB such that ip, model, etc are field names in the DB
+
+```
+source:
+  default: sql
+  sql:
+    adapter: mysql2
+    database: oxidized
+    table: nodes
+    username: root 
+    password: rootpass
+    map:
+      name: ip 
+      model: model
+      username: username
+      password: password
+    vars_map:
+      enable: enable
+```
 
 ### Source: SQLite
 
@@ -572,7 +612,7 @@ 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.
+Below is an advanced example configuration. You will be able to (optionally) 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.
 
 ```
 ---
@@ -617,6 +657,28 @@ source:
 model_map:
   cisco: ios
   juniper: junos
+
+```
+
+### Advanced Group Configuration
+
+For group specific credentials
+
+```
+groups:
+  mikrotik:
+    username: admin
+    password: blank
+  ubiquiti:
+    username: ubnt
+    password: ubnt
+```
+and add group mapping
+```
+map:
+  model: 0
+  name: 1
+  group: 2
 ```
 
 # Hooks
@@ -716,7 +778,7 @@ The following objects exist in Oxidized.
 ## Input
  * gets config from nodes
  * must implement 'connect', 'get', 'cmd'
- * 'ssh' and 'telnet' implemented
+ * 'ssh', 'telnet, ftp, and tftp' implemented
 
 ## Output
  * stores config

data/Rakefile

@@ -19,10 +19,10 @@ task :test do
   end
 end
 
-desc 'Install gem'
-task :install => :build do
-  system "sudo -Es sh -c \'umask 022; gem install gems/#{file}\'"
-end
+## desc 'Install gem'
+## task :install => :build do
+##   system "sudo -Es sh -c \'umask 022; gem install gems/#{file}\'"
+## end
 
 desc 'Remove gems'
 task :clean do

data/extra/rest_client.rb

@@ -2,8 +2,30 @@ module Oxidized
   class RestClient
     require 'net/http'
     require 'json'
-    HOST = 'localhost'
-    PORT = 8888
+    require 'uri'
+    require 'asetus'
+
+    class Config
+      Root      = Root = ENV['OXIDIZED_HOME'] || File.join(ENV['HOME'], '.config', 'oxidized')
+    end
+
+    CFGS = Asetus.new :name=>'oxidized', :load=>false, :key_to_s=>true
+    CFGS.default.rest = '127.0.0.1:8888'
+
+    begin
+      CFGS.load
+    rescue => error
+      raise InvalidConfig, "Error loading config: #{error.message}"
+    end
+
+    restcfg = CFGS.cfg.rest
+    unless restcfg.match(/^http:\/\//)
+      restcfg.insert(0, 'http://')
+    end
+
+    HOST = URI(restcfg).host
+    PORT = URI(restcfg).port
+    PATH = URI(restcfg).path
 
     class << self
       def next opt={}, host=HOST, port=PORT
@@ -18,7 +40,7 @@ module Oxidized
 
     def next opt
       data = JSON.dump opt
-      @web.put '/node/next/' + opt[:name].to_s, data
+      @web.put PATH + '/node/next/' + opt[:name].to_s, data
     end
 
   end

data/lib/oxidized/input/ssh.rb

@@ -42,7 +42,7 @@ module Oxidized
       unless @exec
         shell_open @ssh
         begin
-          @username ? shell_login : expect(@node.prompt)
+          login
         rescue Timeout::Error
           raise PromptUndetect, [ @output, 'not matching configured prompt', @node.prompt ].join(' ')
         end
@@ -102,13 +102,18 @@ module Oxidized
       end
     end
 
-    # Cisco WCS has extremely dubious SSH implementation, SSH auth is always
-    # success, it always opens shell and then run auth in shell. I guess
-    # they'll never support exec() :)
-    def shell_login
-      expect username
-      cmd @node.auth[:username], password
-      cmd @node.auth[:password]
+    # some models have SSH auth or terminal auth based on version of code
+    # if SSH is configured for terminal auth, we'll still try to detect prompt
+    def login
+      if @username
+        match = expect username, @node.prompt
+        if match == username
+          cmd @node.auth[:username], password
+          cmd @node.auth[:password]
+        end
+      else
+        expect @node.prompt
+      end
     end
 
     def exec state=nil
@@ -123,14 +128,18 @@ module Oxidized
       @output
     end
 
-    def expect regexp
-      Oxidized.logger.debug "lib/oxidized/input/ssh.rb: expecting #{regexp.inspect} at #{node.name}"
+    def expect *regexps
+      regexps = [regexps].flatten
+      Oxidized.logger.debug "lib/oxidized/input/ssh.rb: expecting #{regexps.inspect} at #{node.name}"
       Timeout::timeout(Oxidized.config.timeout) do
         @ssh.loop(0.1) do
           sleep 0.1
-          not @output.match regexp
+          match = regexps.find { |regexp| @output.match regexp }
+          return match if match
+          true
         end
       end
     end
+
   end
 end

data/lib/oxidized/input/tftp.rb

@@ -0,0 +1,41 @@
+module Oxidized
+  require 'stringio'
+  require_relative 'cli'
+  
+  begin
+    require 'net/tftp'
+  rescue LoadError
+    raise OxidizedError, 'net/tftp not found: sudo gem install net-tftp'
+  end
+  
+  class TFTP < Input
+    
+    include Input::CLI
+    
+    # TFTP utilizes UDP, there is not a connection. We simply specify an IP and send/receive data.
+    def connect node
+      @node       = node
+
+      @node.model.cfg['tftp'].each { |cb| instance_exec(&cb) }
+      @log = File.open(Oxidized::Config::Log + "/#{@node.ip}-tftp", 'w') if Oxidized.config.input.debug?
+      @tftp = Net::TFTP.new @node.ip
+    end
+
+    def cmd file
+      Oxidized.logger.debug "TFTP: #{file} @ #{@node.name}"
+      config = StringIO.new
+      @tftp.getbinary file, config
+      config.rewind
+      config.read
+    end
+    
+    private
+    
+    def disconnect
+      # TFTP uses UDP, there is no connection to close
+    ensure
+      @log.close if Oxidized.config.input.debug?
+    end
+
+  end
+end

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

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

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

data/lib/oxidized/model/routeros.rb

@@ -1,5 +1,5 @@
 class RouterOS < Oxidized::Model
-  prompt /\[\w+@\S+\]\s?>\s?$/
+  prompt /\[\w+@\S+(\s?\S+)*\]\s?>\s?$/
   comment "# "
 
   cmd '/system routerboard print' do |cfg|
@@ -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

data/lib/oxidized/node.rb

@@ -128,24 +128,15 @@ module Oxidized
     end
 
     def resolve_auth opt
-      # Resolve configured username/password, give priority to group level configuration
-      # TODO: refactor to use revised behaviour of Asetus
-      cfg_username, cfg_password =
-        if Oxidized.config.groups.has_key?(@group) and ['username', 'password'].all? {|e| Oxidized.config.groups[@group].has_key?(e)}
-          [Oxidized.config.groups[@group].username, Oxidized.config.groups[@group].password]
-        elsif ['username', 'password'].all? {|e| Oxidized.config.has_key?(e)}
-          [Oxidized.config.username, Oxidized.config.password]
-        else
-          [nil, nil]
-        end
-      auth = {}
-      auth[:username] = (opt[:username] or cfg_username)
-      auth[:password] = (opt[:password] or cfg_password)
-      auth
+      # Resolve configured username/password
+      {
+        username: resolve_key(:username, opt),
+        password: resolve_key(:password, opt),
+      }
     end
 
     def resolve_input opt
-      inputs = (opt[:input]  or Oxidized.config.input.default)
+      inputs = resolve_key :input, opt, Oxidized.config.input.default
       inputs.split(/\s*,\s*/).map do |input|
         if not Oxidized.mgr.input[input]
           Oxidized.mgr.add_input input or raise MethodNotFound, "#{input} not found for node #{ip}"
@@ -155,7 +146,7 @@ module Oxidized
     end
 
     def resolve_output opt
-      output = (opt[:output] or Oxidized.config.output.default)
+      output = resolve_key :output, opt, Oxidized.config.output.default
       if not Oxidized.mgr.output[output]
         Oxidized.mgr.add_output output or raise MethodNotFound, "#{output} not found for node #{ip}"
       end
@@ -163,7 +154,7 @@ module Oxidized
     end
 
     def resolve_model opt
-      model = (opt[:model] or Oxidized.config.model)
+      model = resolve_key :model, opt
       if not Oxidized.mgr.model[model]
         Oxidized.logger.debug "lib/oxidized/node.rb: Loading model #{model.inspect}"
         Oxidized.mgr.add_model model or raise ModelNotFound, "#{model} not found for node #{ip}"
@@ -187,6 +178,33 @@ module Oxidized
       end
     end
 
+    def resolve_key key, opt, global=nil
+      # resolve key, first get global, then get group then get node config
+      key_sym = key.to_sym
+      key_str = key.to_s
+      value   = global
+      Oxidized.logger.debug "node.rb: resolving node key '#{key}', with passed global value of '#{value}' and node value '#{opt[key_sym]}'"
+
+      #global
+      if not value and Oxidized.config.has_key?(key_str)
+        value = Oxidized.config[key_str]
+        Oxidized.logger.debug "node.rb: setting node key '#{key}' to value '#{value}' from global"
+      end
+
+      #group
+      if Oxidized.config.groups.has_key?(@group)
+        if Oxidized.config.groups[@group].has_key?(key_str)
+          value = Oxidized.config.groups[@group][key_str]
+          Oxidized.logger.debug "node.rb: setting node key '#{key}' to value '#{value}' from group"
+        end
+      end
+
+      #node
+      value = opt[key_sym] || value
+      Oxidized.logger.debug "node.rb: returning node key '#{key}' with value '#{value}'"
+      value
+    end
+
     def is_git? opt
       (opt[:output] || Oxidized.config.output.default) == 'git'
     end

data/lib/oxidized/output/file.rb

@@ -17,7 +17,7 @@ class OxidizedFile < Output
   end
 
   def store node, outputs, opt={}
-    file = @cfg.directory
+    file = File.expand_path @cfg.directory
     if opt[:group]
       file = File.join File.dirname(file), opt[:group]
     end
@@ -28,14 +28,16 @@ class OxidizedFile < Output
   end
 
   def fetch node, group
-    cfg_dir = @cfg.directory
+    cfg_dir = File.expand_path @cfg.directory
+    node_name = node.name
+
     if group # group is explicitly defined by user
-      IO.readlines File.join(cfg_dir, group, node)
+      IO.readlines File.join(cfg_dir, group, node_name)
     else
-      if File.exists? File.join(cfg_dir, node) # node configuration file is stored on base directory
-        IO.readlines File.join(cfg_dir, node)
+      if File.exists? File.join(cfg_dir, node_name) # node configuration file is stored on base directory
+        IO.readlines File.join(cfg_dir, node_name)
       else
-        path = Dir.glob File.join(cfg_dir, '**', node) # fetch node in all groups
+        path = Dir.glob File.join(cfg_dir, '**', node_name) # fetch node in all groups
         return nil if path[0].nil?
         open(path[0], 'r').readlines
       end

data/lib/oxidized/source/csv.rb

@@ -20,7 +20,7 @@ class CSV < Source
     nodes = []
     open(File.expand_path @cfg.file).each_line do |line|
       next if line.match(/^\s*#/)
-      data  = line.chomp.split @cfg.delimiter
+      data  = line.chomp.split(@cfg.delimiter, -1)
       next if data.empty?
       # map node parameters
       keys = {}
@@ -29,9 +29,11 @@ class CSV < Source
       end
       keys[:model] = map_model keys[:model] if keys.key? :model
 
-      # map node specific vars, empty value is considered as nil
+      # map node specific vars
       vars = {}
-      @cfg.vars_map.each { |key, position| vars[key.to_sym] = data[position].to_s.empty? ? nil : data[position] }
+      @cfg.vars_map.each do |key, position|
+        vars[key.to_sym] = node_var_interpolate data[position]
+      end
       keys[:vars] = vars unless vars.empty?
 
       nodes << keys

data/lib/oxidized/source/http.rb

@@ -43,9 +43,11 @@ class HTTP < Source
       end
       keys[:model] = map_model keys[:model] if keys.key? :model
 
-      # map node specific vars, empty value is considered as nil
+      # map node specific vars
       vars = {}
-      @cfg.vars_map.each { |key, position| vars[key.to_sym] = line[position].to_s.empty? ? nil : line[position] }
+      @cfg.vars_map.each do |key, position|
+        vars[key.to_sym] = node_var_interpolate line[position]
+      end
       keys[:vars] = vars unless vars.empty?
 
       nodes << keys

data/lib/oxidized/source/source.rb

@@ -1,11 +1,23 @@
 module Oxidized
   class Source
     class NoConfig < OxidizedError; end
+
     def initialize
       @map = (Oxidized.config.model_map or {})
     end
+
     def map_model model
       @map.has_key?(model) ? @map[model] : model
     end
+
+    def node_var_interpolate var
+       case var
+       when "nil"   then nil
+       when "false" then false
+       when "true"  then true
+       else var
+       end
+    end
+
   end
 end

data/lib/oxidized/source/sql.rb

@@ -31,7 +31,9 @@ class SQL < Source
 
       # map node specific vars
       vars = {}
-      @cfg.vars_map.each { |key, sql_column| vars[key.to_sym] = node[sql_column.to_sym] }
+      @cfg.vars_map.each do |key, sql_column|
+        vars[key.to_sym] = node_var_interpolate node[sql_column.to_sym]
+      end
       keys[:vars] = vars unless vars.empty?
 
       nodes << keys

data/lib/oxidized/version.rb

@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.16.3'
+  VERSION = '0.17.0'
 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.0', '<3.1'
+  s.add_runtime_dependency 'net-ssh', '~> 3.0.2'
   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.16.3
+  version: 0.17.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -44,22 +44,16 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -211,12 +205,14 @@ files:
 - lib/oxidized/input/input.rb
 - lib/oxidized/input/ssh.rb
 - lib/oxidized/input/telnet.rb
+- lib/oxidized/input/tftp.rb
 - lib/oxidized/job.rb
 - lib/oxidized/jobs.rb
 - lib/oxidized/manager.rb
 - lib/oxidized/model/acos.rb
 - lib/oxidized/model/aireos.rb
 - lib/oxidized/model/airos.rb
+- lib/oxidized/model/alvarion
 - lib/oxidized/model/aos.rb
 - lib/oxidized/model/aos7.rb
 - lib/oxidized/model/aosw.rb