oxidized 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bbd5ac3977cc86ed65b0dfd7e7b07b4167ff6ea
-  data.tar.gz: ba35ea479586e341df405b96f22e0f0df2a824f6
+  metadata.gz: 47e10a4f47bf206ef19e583804c53a8574c39119
+  data.tar.gz: 90c5644750d1498582834d7d26d75aedace6dcd8
 SHA512:
-  metadata.gz: 74b2965664b512c425b7ca46b4016e7206fad7492e1b321decc5e50d1d87a77623d6d397a85c7033ab7f29a084807bf3eb8586fa2e04cd38f6c864f530c08cea
-  data.tar.gz: 115db2427fb1be8d4871305ddbfae385c67ae31bd08a0ab3379fc70e033f1f1b675287747b9c0b13ce8629f5bbf4359acfd0b2cce6ad09d05e8a3022c678a9ae
+  metadata.gz: c002efeb2fb02a633bd8b47d602cd5a82d358bc66caf65606dca2ff91cd1add033e60b47d0838a97c95b55d714b9ff0db1a3b451affada1f50bca4f14754db8e
+  data.tar.gz: 22cf2eef018c432dc64bacecd018461ac65611d0d807b53f535e4254593a359d43d8a48f7563c8dedc45e516bdd30ea89e46330807a9184e194d4d30108d63ea

data/CHANGELOG.md

@@ -1,5 +1,12 @@
+# 0 14.0
+- FEATURE: support supermicro swithes (by @funzoneq)
+- FEATURE: support catos switches
+- BUGFIX: git+groups+singlerepo (by @PANZERBARON)
+- BUGFIX: asa, tmos, ironware, ios-xr
+- BUGFIX: mandate net-ssh 3.0.x, don't accept 3.1 (numerous issues)
+
 # 0.13.1
-- BUGFIX: file versions
+- BUGFIX: file permissions (Sigh...)
 
 # 0.13.0
 - FEATURE: http post for configs (by @jgroom33)

data/README.md

@@ -67,6 +67,7 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
  * Cisco
    * AireOS
    * ASA
+   * CatOS
    * IOS
    * IOSXR
    * NXOS
@@ -112,6 +113,8 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
    * Opengear
  * Palo Alto
    * PANOS
+ * Supermicro
+   * Supermicro
  * Ubiquiti
    * AirOS
    * Edgeos
@@ -125,7 +128,7 @@ Oxidized is a network device configuration backup tool. It's a RANCID replacemen
 Install all required packages and gems.
 
 ```shell
-apt-get install ruby ruby-dev libsqlite3-dev libssl-dev pkg-config cmake
+apt-get install ruby ruby-dev libsqlite3-dev libssl-dev pkg-config cmake libssh2-1-dev
 gem install oxidized
 gem install oxidized-script oxidized-web # if you don't install oxidized-web, make sure you remove "rest" from your config
 ```
@@ -401,9 +404,23 @@ output:
   git:
     user: Oxidized
     email: o@example.com
-    repo:
-      first: "/var/lib/oxidized/first.git"
-      second: "/var/lib/oxidized/second.git"
+    repo: "/var/lib/oxidized/git-repos/default.git"
+```
+
+Oxidized will create a repository for each group in the same directory as the `default.git`. For
+example:
+
+``` csv
+host1:ios:first
+host2:nxos:second
+```
+
+This will generate the following repositories:
+
+``` bash
+$ ls /var/lib/oxidized/git-repos
+
+default.git first.git second.git
 ```
 
 If you would like to use groups and a single repository, you can force this with the `single_repo` config.

data/lib/oxidized/model/asa.rb

@@ -18,7 +18,7 @@ class ASA < Oxidized::Model
 
   cmd 'show version' do |cfg|
     # avoid commits due to uptime / ixo-router01 up 2 mins 28 secs / ixo-router01 up 1 days 2 hours
-    cfg = cfg.each_line.select { |line| not line.match /\s+up\s+\d+\s+/ }
+    cfg = cfg.each_line.select { |line| not line.match /(\s+up\s+\d+\s+)|(.*days.*)/ }
     cfg = cfg.join
     comment cfg
   end
@@ -30,6 +30,22 @@ class ASA < Oxidized::Model
   cmd 'more system:running-config' do |cfg|
     cfg = cfg.each_line.to_a[3..-1].join
     cfg.gsub! /^: [^\n]*\n/, ''
+    # backup any xml referenced in the configuration.
+    anyconnect_profiles = cfg.scan(Regexp.new('(\sdisk0:/.+\.xml)')).flatten
+    anyconnect_profiles.each do |profile|
+	cfg << (comment profile + "\n" )
+    	cmd ("more" + profile) do |xml|
+	  cfg << (comment xml)
+	end
+    end
+    # if DAP is enabled, also backup dap.xml
+    if cfg.rindex(/dynamic-access-policy-record\s(?!DfltAccessPolicy)/)
+   	cfg << (comment "disk0:/dap.xml\n")
+        cmd "more disk0:/dap.xml" do |xml|
+          cfg << (comment xml)
+	  puts xml
+        end
+    end
     cfg
   end
 

data/lib/oxidized/model/catos.rb

@@ -0,0 +1,36 @@
+class Catos < Oxidized::Model
+
+  prompt /^[\w.@-]+> \(enable\) $/
+  comment '# '
+
+  cmd :all do |cfg|
+    cfg.each_line.to_a[1..-2].join
+  end
+
+  cmd 'show system' do |cfg|
+    cfg = cfg.gsub /(\s+)\d+,\d+:\d+:\d+(\s+)/, '\1X\2'
+    comment cfg
+  end
+
+  cmd 'show version' do |cfg|
+    cfg = cfg.gsub /\d+(K)/, 'X\1'
+    cfg = cfg.gsub /^(Uptime is ).*/, '\1X'
+    comment cfg
+  end
+
+  cmd 'show conf all' do |cfg|
+    cfg = cfg.sub /^(#time: ).*/, '\1X'
+    cfg.each_line.drop_while { |line| not line.match /^begin/ }.join
+  end
+
+  cfg :telnet do
+    username /^Username: /
+    password /^Password:/
+  end
+
+  cfg :ssh, :telnet do
+    post_login 'set length 0'
+    pre_logout 'exit'
+  end
+
+end

data/lib/oxidized/model/iosxr.rb

@@ -30,7 +30,7 @@ class IOSXR < Oxidized::Model
 
   cfg :telnet do
     username /^Username:/
-    password /^Password:/
+    password /^\r?Password:/
   end
 
   cfg :telnet, :ssh do

data/lib/oxidized/model/ironware.rb

@@ -23,6 +23,7 @@ class IronWare < Oxidized::Model
 
   cmd 'show version' do |cfg|
     cfg.gsub! /(^((.*)[Ss]ystem uptime(.*))$)/, '' #remove unwanted line system uptime
+    cfg.gsub! /(^((.*)[Tt]he system started at(.*))$)/, ''
     cfg.gsub! /[Uu]p\s?[Tt]ime is .*/,''
 
     comment cfg

data/lib/oxidized/model/supermicro.rb

@@ -0,0 +1,45 @@
+class Supermicro < Oxidized::Model
+  comment  '! '
+
+  cmd :secret do |cfg|
+    cfg.gsub!(/password \d+ (\S+).*/, '<secret removed>')
+    cfg.gsub!(/community (\S+)/, 'community <hidden>')
+    cfg
+  end
+
+  cmd :all do |cfg|
+     cfg.each_line.to_a[2..-2].join
+  end
+
+  cmd 'show running-config'
+
+  cmd 'show access-list tcam-utilization' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show memory' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show system' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show version' do |cfg|
+    comment cfg
+  end
+
+  cmd 'show watchdog' do |cfg|
+    comment cfg
+  end
+
+  cfg :telnet do
+    username /^Username:/
+    password /^Password:/
+  end
+
+  cfg :telnet, :ssh do
+    post_login 'terminal length 0'
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/tmos.rb

@@ -3,18 +3,20 @@ class TMOS < Oxidized::Model
   comment  '# '
 
   cmd :secret do |cfg|
-    cfg.gsub!(/password (\S+)/, 'password <secret removed>')
-    cfg.gsub!(/passphrase (\S+)/, 'passphrase <secret removed>')
-    cfg.gsub!(/community (\S+)/, 'community <secret removed>')
-    cfg.gsub!(/community-name (\S+)/, 'community-name <secret removed>')
+    cfg.gsub!(/^([\s\t]*)secret \S+/, '\1secret <secret removed>')
+    cfg.gsub!(/^([\s\t]*\S*)password \S+/, '\1password <secret removed>')
+    cfg.gsub!(/^([\s\t]*\S*)passphrase \S+/, '\1passphrase <secret removed>')
+    cfg.gsub!(/community \S+/, 'community <secret removed>')
+    cfg.gsub!(/community-name \S+/, 'community-name <secret removed>')
+    cfg.gsub!(/^([\s\t]*\S*)encrypted \S+$/, '\1encrypted <secret removed>')
     cfg
   end
 
-  cmd('tmsh show sys version') { |cfg| comment cfg }
+  cmd('tmsh -q show sys version') { |cfg| comment cfg }
 
-  cmd('tmsh show sys software') { |cfg| comment cfg }
+  cmd('tmsh -q show sys software') { |cfg| comment cfg }
 
-  cmd 'tmsh show sys hardware field-fmt' do |cfg|
+  cmd 'tmsh -q show sys hardware field-fmt' do |cfg|
     cfg.gsub!(/fan-speed (\S+)/, '')
     cfg.gsub!(/temperature (\S+)/, '')
     comment cfg

data/lib/oxidized/output/git.rb

@@ -70,7 +70,10 @@ class Git < Output
     def version node, group
       begin
         repo = @cfg.repo
-        if group
+        path = node
+        if group and @cfg.single_repo?
+          path = "#{group}/#{node}"
+        elsif group
           repo = File.join File.dirname(repo), group + '.git'
         end
         repo = Rugged::Repository.new repo
@@ -80,7 +83,7 @@ class Git < Output
         i = -1
         tab  = []
         walker.each do |commit|
-          if commit.diff(paths: [node]).size > 0
+          if commit.diff(paths: [path]).size > 0
             hash = {}
             hash[:date] = commit.time.to_s
             hash[:oid] = commit.oid
@@ -100,7 +103,7 @@ class Git < Output
     def get_version node, group, oid
       begin
         repo = @cfg.repo
-        if group && group != ''
+        if group && group != '' && !@cfg.single_repo?
           repo = File.join File.dirname(repo), group + '.git'
         end
         repo = Rugged::Repository.new repo
@@ -115,7 +118,7 @@ class Git < Output
       begin
         repo = @cfg.repo
         diff_commits = nil
-        if group && group != ''
+        if group && group != '' && !@cfg.single_repo?
           repo = File.join File.dirname(repo), group + '.git'
         end
         repo = Rugged::Repository.new repo

data/lib/oxidized/version.rb

@@ -1,3 +1,3 @@
 module Oxidized
-  VERSION = '0.13.1'
+  VERSION = '0.14.0'
 end

data/oxidized.gemspec

@@ -21,11 +21,11 @@ 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', '>= 3.0.2'
-  s.add_runtime_dependency 'rugged',  '~> 0.21', '>= 0.21.4'
-  s.add_development_dependency 'pry', '~> 0'
-  s.add_development_dependency 'bundler', '~> 1.10'
-  s.add_development_dependency 'rake', '~> 10.0'
+  s.add_runtime_dependency 'net-ssh', '>= 3.0.0', '<3.1'
+  s.add_runtime_dependency 'rugged',  '~> 0.21',  '>= 0.21.4'
+  s.add_development_dependency 'pry',      '~> 0'
+  s.add_development_dependency 'bundler',  '~> 1.10'
+  s.add_development_dependency 'rake',     '~> 10.0'
   s.add_development_dependency 'minitest', '~> 5.8'
-  s.add_development_dependency 'mocha', '~> 1.1'
+  s.add_development_dependency 'mocha',    '~> 1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxidized
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.0
 platform: ruby
 authors:
 - Saku Ytti
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asetus
@@ -44,22 +44,22 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +207,7 @@ files:
 - lib/oxidized/model/aosw.rb
 - lib/oxidized/model/asa.rb
 - lib/oxidized/model/c4cmts.rb
+- lib/oxidized/model/catos.rb
 - lib/oxidized/model/ciscosmb.rb
 - lib/oxidized/model/comware.rb
 - lib/oxidized/model/cumulus.rb
@@ -239,6 +240,7 @@ files:
 - lib/oxidized/model/routeros.rb
 - lib/oxidized/model/saos.rb
 - lib/oxidized/model/screenos.rb
+- lib/oxidized/model/supermicro.rb
 - lib/oxidized/model/timos.rb
 - lib/oxidized/model/tmos.rb
 - lib/oxidized/model/vrp.rb