corona 0.0.5 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dbac544706aa6c8804d989307768c20ed0e5149
-  data.tar.gz: efe2c5e74b075d7fa8206c2ce0413221aaf6e345
+  metadata.gz: 7e49adab5f337e985451474bbe92fafb21843669
+  data.tar.gz: db98d73fb163e1b7ade57187f6d1b13fcc0bdd4b
 SHA512:
-  metadata.gz: d00f70284e1d0049d153d83b9c24ae3a49191235fc714fd80f049ba4ab4e2689d2c54aeca1a6e7182d238a064035ea92ff048f6a6f574a36f25bd94e96b4648f
-  data.tar.gz: 8426a763a70f6d6529b4dff2d8b9e0ba77be47893454fba3d9e91be55408bf1992e281622002457a4a5e4b2751b5fada89bd6dad0c7b516a17f4ed6be785e8cd
+  metadata.gz: f3135206c5e6c516028e6c7eb7a0a24d97418d7da354d89bac8567786318c576eb6616111ba545fa0c1afe74e17a807baea64a31d3c8bb6bf8b55bc9525f716c
+  data.tar.gz: ba8bac0dfb90302c83bc07d6ce06bc23e8c96c824fe6a5793629b4b9ea93b93e99deccc2cca8380f2188c36886b05c4599e805030e51ec5c73add8c62732921c

data/Gemfile.lock

@@ -1,16 +1,17 @@
 PATH
   remote: .
   specs:
-    corona (0.0.5)
+    corona (0.0.8)
       sequel
+      slop
       snmp
       sqlite3
 
 GEM
   remote: https://rubygems.org/
   specs:
-    rspec-core (2.14.7)
     sequel (4.7.0)
+    slop (3.4.7)
     snmp (1.1.1)
     sqlite3 (1.3.8)
 
@@ -19,4 +20,3 @@ PLATFORMS
 
 DEPENDENCIES
   corona!
-  rspec-core

data/bin/corona

@@ -1,5 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'corona'
-
-Corona.new
+begin
+  require 'corona/cli'
+  Corona::CLI.new.run
+rescue => error
+  warn "#{error}"
+  raise if Corona::CFG.debug
+end

data/corona.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'corona'
-  s.version           = '0.0.5'
+  s.version           = '0.0.8'
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]
   s.email             = %w( saku@ytti.fi )
@@ -15,5 +15,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'sequel'
   s.add_dependency 'sqlite3'
   s.add_dependency 'snmp'
-  s.add_development_dependency 'rspec-core'
+  s.add_dependency 'slop'
 end

data/lib/corona/cli.rb

@@ -0,0 +1,27 @@
+module Corona
+  class CLI
+    require 'corona'
+    require 'slop'
+
+    def run cidr=@cidr
+      Corona.new :cidr=>cidr
+    end
+
+    private
+
+    def initialize
+      args, opts = opts_parse
+      @cidr = args.shift
+      CFG.debug = true if opts[:debug]
+    end
+
+    def opts_parse
+      opts = Slop.parse(:help=>true) do
+        banner 'Usage: corona [cidr]'
+        on 'd', 'debug', 'Debugging on'
+      end
+      [opts.parse!, opts]
+    end
+
+  end
+end

data/lib/corona/core.rb

@@ -8,8 +8,8 @@ require 'resolv'
 
 module Corona
   class << self
-    def new
-      Core.new
+    def new opts={}
+      Core.new opts
     end
   end
 
@@ -17,15 +17,16 @@ module Corona
 
     private
 
-    def initialize
-      poll, ignore = resolve_networks
-      @mutex       = Mutex.new
-      @db          = DB.new
-      threads      = []
+    def initialize opts={}
+      cidr          = opts.delete :cidr
+      poll, ignores = resolve_networks cidr
+      @mutex        = Mutex.new
+      @db           = DB.new
+      threads       = []
       Thread.abort_on_exception = true
       poll.each do |net|
         net.to_range.each do |ip|
-          next if ignore.any? { |ignore| ignore.include? ip }
+          next if ignores.any? { |ignore| ignore.include? ip }
           while threads.size >= CFG.threads
             threads.delete_if { |thread| not thread.alive? }
             sleep 0.01
@@ -125,16 +126,17 @@ module Corona
       {
         :ip              => opt[:ip].to_s,
         :ptr             => ip2name(opt[:ip].to_s),
-        :model           => Model.map(opt[:oids][:sysDescr]),
+        :model           => Model.map(opt[:oids][:sysDescr], opt[:oids][:sysObjectID]),
         :oid_ifDescr     => opt[:int],
         :oid_sysName     => opt[:oids][:sysName],
         :oid_sysLocation => opt[:oids][:sysLocation],
         :oid_sysDescr    => opt[:oids][:sysDescr],
+        :oid_sysObjectID => opt[:oids][:sysObjectID].join('.'),
       }
     end
 
     def normalize_opt opt
-      opt[:oids][:sysName].sub! /-re[1-9]\./, '-re0.'
+      opt[:oids][:sysName].sub!(/-re[1-9]\./, '-re0.')
       opt
     end
 
@@ -142,14 +144,15 @@ module Corona
       Resolv.getname ip rescue ip
     end
 
-    def resolve_networks
-      [CFG.poll, CFG.ignore].map do |nets|
+    def resolve_networks cidr
+      cidr = cidr ? [cidr].flatten : CFG.poll
+      [cidr, CFG.ignore].map do |nets|
         if nets.respond_to? :each
           nets.map { |net| IPAddr.new net }
         else
           out = []
           File.read(nets).each_line do |net|
-            net = net.match /^([\d.\/]+)/
+            net = net.match(/^([\d.\/]+)/)
             out.push IPAddr.new net[1] if net
           end
           out

data/lib/corona/db/model.rb

@@ -13,6 +13,7 @@ module Corona
         String      :oid_sysName
         String      :oid_sysLocation
         String      :oid_sysDescr
+        String      :oid_sysObjectID
       end
       create_table unless table_exists?
     end

data/lib/corona/model.rb

@@ -1,6 +1,6 @@
 module Corona
   class Model
-    def self.map sysDescr
+    def self.map sysDescr, sysObjectID
       case sysDescr
       when /Cisco Catalyst Operating System/i
         'catos'
@@ -22,12 +22,27 @@ module Corona
         'ironware'
       when /^Summit/
         'xos'
+      when /TiMOS/
+        'timos'
+      when /^Alcatel-Lucent \S+ [789]\./  #aos <7 is vxworks, >=7 is linux
+        'aos7'
+      when /^AOS-W/
+        'aosw'
       when /^Alcatel-Lucent/
         'aos'
+      when /^AX Series/
+        'acos'
       when /ProCurve/  # ProCurve OS does not seem to have name?
         'procurve'
       when /^\d+[A-Z]\sEthernet Switch$/
         'powerconnect'
+      else
+        case sysObjectID
+        when Regexp.new('^' + Regexp.quote('1.3.6.1.4.1.12356.'))
+          'fortios'  # 1.3.6.1.4.1.12356.101.1.10004
+        else
+          'unsupported'
+        end
       end
     end
   end

data/lib/corona/snmp.rb

@@ -2,14 +2,15 @@ module Corona
   class SNMP
     DB_OID = {
       :sysDescr     => '1.3.6.1.2.1.1.1.0',
-      :sysLocation  => '1.3.6.1.2.1.1.6.0',
+      :sysObjectID  => '1.3.6.1.2.1.1.2.0',
       :sysName      => '1.3.6.1.2.1.1.5.0',
+      :sysLocation  => '1.3.6.1.2.1.1.6.0',
     }
     OID = {
+       :ifDescr            => '1.3.6.1.2.1.2.2.1.2',
        :ipCidrRouteIfIndex => '1.3.6.1.2.1.4.24.4.1.5',  # addr.255.255.255.255.0.0.0.0.0
        :ipAdEntIfIndex     => '1.3.6.1.2.1.4.20.1.2',    # addr
        :ipAddressIfIndex   => '1.3.6.1.2.1.4.34.1.3',    # 1,2 (uni,any) . 4,16 (size) . addr
-       :ifDescr            => '1.3.6.1.2.1.2.2.1.2',
     }
     UNICAST = 1
     IPV4    = 4
@@ -54,7 +55,7 @@ module Corona
         r = @snmp.get_bulk 0, BULK_MAX, oid
         r.varbind_list.each do |vb|
           oid = vb.name.to_str
-          (last = true; break) if not oid.match /^#{Regexp.quote root}/
+          (last = true; break) if not oid.match(/^#{Regexp.quote root}/)
           vbs.push vb
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: corona
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.8
 platform: ruby
 authors:
 - Saku Ytti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -53,13 +53,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-core
+  name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -83,6 +83,7 @@ files:
 - bin/corona
 - corona.gemspec
 - lib/corona.rb
+- lib/corona/cli.rb
 - lib/corona/config/bootstrap.rb
 - lib/corona/config/core.rb
 - lib/corona/core.rb