oxidized 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1bfddbfd99ad2fed7d779ec60118dbd86f4bad07
-  data.tar.gz: beaccfd0dfd4b30f324bee21e24057972d76ec9d
+  metadata.gz: 08d1ddb80997414fda90c9aaa4c1cda7d572b092
+  data.tar.gz: 2f11578926ac497672dda0293231b53e90bf3f6e
 SHA512:
-  metadata.gz: bae25268e3a819d06d65d4eb633946e7db774b078bed111ab3a99d351f449adfb6f6ae4cd862c214caceea990050057f3b59e2dd83ef80cfb45d1ba52ca8cb4a
-  data.tar.gz: 518319120a58a267662c2dd27bda071b505a5ced89c94d38936ad69a0eedf015ba1c15aa47b43a24032d26238a77cc35d15c6260456ac563c3057db818cec43b
+  metadata.gz: 59f6306c9dd3e6d586ed21340f1844647d343692e00a6a17a5f841d1254ba26643b2747f1c66599cd567d8b03e3f44c2689aabca705be000f0d93f82c99b8546
+  data.tar.gz: 2352a0a428db0b54f971adf502c640142aed75b48bd0199fb380f2507bf49fb2d95cc13aeffd03db2c6d6f5760b5461fc9e222a28fc7b0f52ffdc3704d85c4b1

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.6.0
+- FEATURE: support cumulus linux (by @FlorianDoublet)
+- FEATURE: support HP Comware SMB siwtches (by @sid3windr)
+- FEATURE: remove secret additions (by @rodecker)
+- FEATURE: option to put all groups in single repo (by @ytti)
+- FEATURE: expand path in source: csv: (so that ~/foo/bar works) (by @ytti)
+- BUGFIX: screenos fixes (by @rixxxx)
+- BUGFIX: ironware fixes (by @FlorianDoublet)
+- BUGFIX: powerconnect fixes (by @sid3windr)
+- BUGFIX: don't ask interactive password in new net/ssh (by @ytti)
+
 # 0.5.0
 - FEATURE: Mikrotik RouterOS model (by @emjemj)
 - FEATURE: add support for Cisco VSS (by @MrRJ45)
@@ -22,7 +33,7 @@
 - BUGFIX: allow node to be removed while it is being collected
 - BUGFIX: if model returns non string value, return empty string
 - BUGFIX: better prompt for Arista EOS model (by @rodecker)
-- BUGFIX: improved configuration handling for Arista EOS model (by @rodecker) 
+- BUGFIX: improved configuration handling for Arista EOS model (by @rodecker)
 
 # 0.3.0
 - FEATURE: *FIXME* bunch of stuff I did for richih, docs needed

data/README.md

@@ -55,6 +55,7 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacment
  * Cisco IOS-XR
  * Cisco NXOS
  * Cisco SMB (Nikola series)
+ * Cumulus Linux
  * DELL PowerConnect
  * Extreme Networks XOS
  * Force10 FTOS

data/Rakefile

@@ -40,7 +40,12 @@ task :clean do
   FileUtils.rm_rf 'gems'
 end
 
+desc 'Tag the release'
+task :tag do
+  system "git tag #{gemspec.version}"
+end
+
 desc 'Push to rubygems'
-task :push do
+task :push => :tag do
   system "gem push gems/#{file}"
 end

data/lib/oxidized/input/ssh.rb

@@ -23,7 +23,9 @@ module Oxidized
       @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
+                            :paranoid => secure,
+                            :auth_methods => %w(publickey password),
+                            :number_of_password_prompts => 0
       unless @exec
         shell_open @ssh
         begin

data/lib/oxidized/model/comware.rb

@@ -21,6 +21,17 @@ class Comware < Oxidized::Model
   end
 
   cfg :telnet, :ssh do
+    # enable command-line mode on SMB comware switches (HP V1910, V1920)
+    # autodetection is hard, because the 'summary' command is paged, and
+    # the pager cannot be disabled before _cmdline-mode on.
+    if vars :comware_cmdline
+      post_login do
+        send "_cmdline-mode on\n"
+        send "y\n"
+        send vars(:comware_cmdline) + "\n"
+      end
+    end
+
     post_login 'screen-length disable'
     post_login 'undo terminal monitor'
     pre_logout 'quit'

data/lib/oxidized/model/cumulus.rb

@@ -0,0 +1,76 @@
+class Cumulus < Oxidized::Model
+  
+  prompt /^((\w*)@(.*)([>#]\s)+)$/
+  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 'THE HOSTNAME'
+    cfg += cmd 'cat /etc/hostname'
+    
+    cfg += add_comment 'THE HOSTS'
+    cfg += cmd 'cat /etc/hosts'
+    
+    cfg += add_comment 'THE INTERFACES'
+    cfg += cmd 'cat /etc/network/interfaces'
+    
+    cfg += add_comment 'RESOLV.CONF'
+    cfg += cmd 'cat /etc/resolv.conf'
+    
+    cfg += add_comment 'NTP.CONF'
+    cfg += cmd 'cat /etc/ntp.conf'
+    
+    cfg += add_comment 'QUAGGA DAEMONS'
+    cfg += cmd 'cat /etc/quagga/daemons'
+    
+    cfg += add_comment 'QUAGGA ZEBRA'
+    cfg += cmd 'cat /etc/quagga/zebra.conf'
+    
+    cfg += add_comment 'QUAGGA BGP'
+    cfg += cmd 'cat /etc/quagga/bgpd.conf'
+    
+    cfg += add_comment 'QUAGGA OSPF'
+    cfg += cmd 'cat /etc/quagga/ospfd.conf'
+    
+    cfg += add_comment 'QUAGGA OSPF6'
+    cfg += cmd 'cat /etc/quagga/ospf6d.conf'
+    
+    cfg += add_comment 'MOTD'
+    cfg += cmd 'cat /etc/motd'
+    
+    cfg += add_comment 'PASSWD'
+    cfg += cmd 'cat /etc/passwd'
+    
+    cfg += add_comment ' SWITCHD'
+    cfg += cmd 'cat /etc/cumulus/switchd.conf'
+    
+    cfg += add_comment 'ACL'
+    cfg += cmd 'iptables -L'
+    
+    cfg += add_comment 'VERSION'
+    cfg += cmd 'cat /etc/cumulus/etc.replace/os-release'
+    
+  end
+  
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    pre_logout 'exit'
+  end
+ 
+
+end

data/lib/oxidized/model/eos.rb

@@ -13,6 +13,7 @@ class EOS < Oxidized::Model
   cmd :secret do |cfg|
      cfg.gsub! /^(snmp-server community).*/, '\\1 <configuration removed>'
      cfg.gsub! /username (\S+) privilege (\d+) (\S+).*/, '<secret hidden>'
+     cfg.gsub! /^(enable secret).*/, '\\1 <configuration removed>'
      cfg
   end
 

data/lib/oxidized/model/ironware.rb

@@ -1,9 +1,22 @@
 class IronWare < Oxidized::Model
 
+  prompt /^.+[>#]\s?$/
   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, ''
+  #end
 
   cmd :all do |cfg|
-    cfg.each_line.to_a[1..-3].join
+    cfg.each_line.to_a[1..-2].join
   end
 
   cmd 'show running-config' do |cfg|
@@ -12,11 +25,21 @@ class IronWare < Oxidized::Model
   end
 
   cmd 'show version' do |cfg|
+    cfg.gsub! /(^((.*)system uptime(.*))$)/, '' #remove unwanted line system uptime
     comment cfg
   end
 
   cmd 'show chassis' do |cfg|
     cfg.gsub! "\xFF", '' # ugly hack - avoids JSON.dump utf-8 breakage on 1.9..
+    cfg.gsub! /(^((.*)Current temp(.*))$)/, '' #remove unwanted lines current temperature
+    comment cfg
+  end
+  
+  cmd 'show flash' do |cfg|
+    comment cfg
+  end
+  
+  cmd 'show module' do |cfg|
     comment cfg
   end
 
@@ -25,9 +48,19 @@ class IronWare < Oxidized::Model
     password /^Password:/
   end
 
+  #handle pager with enable
   cfg :telnet, :ssh do
+    if vars :enable
+      post_login do
+        send "enable\n"
+        send vars(:enable) + "\n"
+      end
+    end
     post_login 'skip-page-display'
+    post_login 'terminal length 0'
     pre_logout 'logout'
+    pre_logout 'exit'
+    pre_logout 'exit'
   end
 
-end
+end

data/lib/oxidized/model/model.rb

@@ -1,3 +1,4 @@
+require 'strscan'
 require_relative 'outputs'
 
 module Oxidized

data/lib/oxidized/model/powerconnect.rb

@@ -4,7 +4,7 @@ class PowerConnect < Oxidized::Model
 
   comment  '! '
 
-  expect /^\s--More--\s+.*$/ do |data, re|
+  expect /^\s*--More--\s+.*$/ do |data, re|
      send ' '
      data.sub re, ''
   end
@@ -50,8 +50,8 @@ class PowerConnect < Oxidized::Model
     skip_block = false
     cfg.each_line do |line|
       if line.match /Up\sTime|Temperature|Power Supplies/i
-        # For 34xx, 54xx, 55xx, and 8024F we should skip this block (terminated by a blank line)
-        skip_block = true if @model =~ /^(34|35)(24|48)$|^(54|55)(24|48)$|^8024$/
+        # For 34xx, 35xx, 54xx, 55xx, 62xx and 8024F we should skip this block (terminated by a blank line)
+        skip_block = true if @model =~ /^(34|35)(24|48)$|^(54|55)(24|48)$|^(62)(24|48)$|^8024$/
       end
       # If we have lines to skip do this until we reach and empty line
       if skip_block
@@ -64,5 +64,4 @@ class PowerConnect < Oxidized::Model
     out << "\n"
   end
 
-
 end

data/lib/oxidized/model/screenos.rb

@@ -4,7 +4,7 @@ class ScreenOS  < Oxidized::Model
 
   comment  '! '
 
-  prompt '/^([\w.-\(\)]+->\s?)$/'
+  prompt /^[\w.:\(\)-]+->\s?$/
 
   cmd :all do |cfg|
     cfg.each_line.to_a[2..-2].join
@@ -33,7 +33,10 @@ class ScreenOS  < Oxidized::Model
 
   cfg :telnet, :ssh do
     post_login 'set console page 0'
-    pre_logout 'exit'
+    pre_logout do
+      send "exit\n"
+      send "n"
+    end
   end
 
 end

data/lib/oxidized/output/git.rb

@@ -68,17 +68,23 @@ class Git < Output
   def update repo, file, data
     return if data.empty?
     if @opt[:group]
-      repo = File.join File.dirname(repo), @opt[:group] + '.git'
+      if @cfg.single_repo?
+        file = File.join @opt[:group], file
+      else
+        repo = File.join File.dirname(repo), @opt[:group] + '.git'
+      end
     end
-    repo = Rugged::Repository.new repo
-    update_repo repo, file, data, @msg, @user, @email
-  rescue Rugged::OSError, Rugged::RepositoryError => open_error
     begin
-      Rugged::Repository.init_at repo, :bare
-    rescue => create_error
-      raise GitError, "first '#{open_error.message}' was raised while opening git repo, then '#{create_error.message}' was while trying to create git repo"
+      repo = Rugged::Repository.new repo
+      update_repo repo, file, data, @msg, @user, @email
+    rescue Rugged::OSError, Rugged::RepositoryError => open_error
+      begin
+        Rugged::Repository.init_at repo, :bare
+      rescue => create_error
+        raise GitError, "first '#{open_error.message}' was raised while opening git repo, then '#{create_error.message}' was while trying to create git repo"
+      end
+      retry
     end
-    retry
   end
 
   def update_repo repo, file, data, msg, user, email

data/lib/oxidized/source/csv.rb

@@ -18,7 +18,7 @@ class CSV < Source
 
   def load
     nodes = []
-    open(@cfg.file).each_line do |line|
+    open(File.expand_path @cfg.file).each_line do |line|
       next if line.match /^\s*#/
       data  = line.chomp.split @cfg.delimiter
       next if data.empty?

data/oxidized.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'oxidized'
-  s.version           = '0.5.0'
+  s.version           = '0.6.0'
   s.licenses          = %w( Apache-2.0 )
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti', 'Samer Abdel-Hafez' ]
@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'asetus',  '~> 0.1'
   s.add_runtime_dependency 'slop',    '~> 3.5'
   s.add_runtime_dependency 'net-ssh', '~> 2.8'
-  s.add_runtime_dependency 'rugged',  '~> 0.21.4'
+  s.add_runtime_dependency 'rugged',  '~> 0.21', '>= 0.21.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -58,6 +58,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.21.4
   type: :runtime
@@ -65,6 +68,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.21.4
 description: software to fetch configuration from network devices and store them
@@ -110,6 +116,7 @@ files:
 - lib/oxidized/model/asa.rb
 - lib/oxidized/model/ciscosmb.rb
 - lib/oxidized/model/comware.rb
+- lib/oxidized/model/cumulus.rb
 - lib/oxidized/model/eos.rb
 - lib/oxidized/model/fabricos.rb
 - lib/oxidized/model/fortios.rb
@@ -164,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oxidized
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: feeble attempt at rancid