netcrawl 0.0.1 → 0.0.2

data/lib/netcrawl/method/cdp.rb

@@ -1,6 +1,7 @@
 require_relative '../snmp'
 class NetCrawl
   class CDP
+    include NameMap
     OID = {
       # http://tools.cisco.com/Support/SNMP/do/BrowseOID.do?local=en&translate=Translate&objectInput=1.3.6.1.4.1.9.9.23.1.2.1.1
       :cdpCacheAddress  => '1.3.6.1.4.1.9.9.23.1.2.1.1.4',
@@ -15,9 +16,9 @@ class NetCrawl
     end
 
     def peers
-      @snmp.bulkwalk(OID[:cdpCacheAddress]).map do |vb|
-        vb.as_ip
-      end
+      addrs = @snmp.walk2hash(OID[:cdpCacheAddress])  { |vb| vb.as_ip }
+      names = @snmp.walk2hash(OID[:cdpCacheDeviceId]) { |vb| DNS.getip namemap(vb.value) }
+      names.keys.map { |id| names[id] or addrs[id] }.compact
     rescue SNMP::NoResponse
       []
     end
@@ -28,6 +29,5 @@ class NetCrawl
       @snmp = SNMP.new host
     end
 
-
   end
 end

data/lib/netcrawl/method/lldp.rb

@@ -4,9 +4,19 @@ class NetCrawl
     include NameMap
     OID = {
       # http://standards.ieee.org/getieee802/download/802.1AB-2009.pdf
+      # finding IP address for LLDP neighbour as of JunOS 13.3R1 and IOS 15.0(2)SG8 is not practical
+      # ifsubtype is ifindex but value 0 for JunOS neighbours
+      # ifsubtype is systemportnumber for IOS neighbours (what ever that is)
+      # luckily some IP address is in the OID key itself, while dodgy, better than nothing
+      #   in JunOS it was some random RFC1918 address in VRF interface, not something I could poll
+      #   .1.0.8802.1.1.2.1.4.2.1.3.0.134.10.1.4.10.0.0.4
+      #   in IOS it was usable address
+      #   .1.0.8802.1.1.2.1.4.2.1.3.0.257.1.1.4.62.243.146.245
+      #   (1.4 is IPv4)
       :lldpRemChassisIdSubtype => '1.0.8802.1.1.2.1.4.1.1.4', # CSCO and JNPR use 4 (MAC address) rendering ChassisID useless
       :lldpRemChassisId        => '1.0.8802.1.1.2.1.4.1.1.5',
       :lldpRemSysName          => '1.0.8802.1.1.2.1.4.1.1.9',
+      :lldpRemManAddrIfSubtype => '1.0.8802.1.1.2.1.4.2.1.3',
     }
 
     # @param [String] host host to query
@@ -17,9 +27,12 @@ class NetCrawl
     end
 
     def peers
-      @snmp.bulkwalk(OID[:lldpRemSysName]).map do |vb|
-        DNS.getip namemap(vb.value)
-      end.compact
+      addrs = @snmp.walk2hash(OID[:lldpRemManAddrIfSubtype]) do |vb|
+        key = vb.oid[OID[:lldpRemManAddrIfSubtype].split('.').size .. -7]
+        [vb.oid.last(4).join('.'), key]
+      end  # FIXME: I am IPv4 specific and generally dodgy
+      names = @snmp.walk2hash(OID[:lldpRemSysName]) { |vb| DNS.getip namemap(vb.value) }
+      names.keys.map { |id| names[id] or addrs[id] }.compact
     rescue SNMP::NoResponse
       []
     end
@@ -30,6 +43,5 @@ class NetCrawl
       @snmp = SNMP.new host
     end
 
-
   end
 end

data/lib/netcrawl/snmp.rb

@@ -39,6 +39,24 @@ class NetCrawl
       results
     end
 
+    # bulkwalks oid returning hash based on block block gets SNMP::VarBind and
+    # shold rturn either hash_value or [hash_value, hash_key]
+    # if block does not return hash_key, hash_key is oid-root, e.g. if root is
+    # 1.2 and oid is 1.2.3.4.5 then key is 3.4.5
+    # @param [String] oid root oid to walk
+    # @yield [SNMP::VarBind] gives vb to block, expect back hash_value or [hash_value, hash_key]
+    # @return [Hash] resulting hash
+    def walk2hash oid, &block
+      index = oid.split('.').size
+      hash  = {}
+      bulkwalk(oid).each do |vb|
+        value, key = block.call(vb)
+        key ||= vb.oid[index..-1]
+        hash[key] = value
+      end
+      hash
+    end
+
     private
 
     def initialize host, community=CFG.snmp.community, timeout=CFG.snmp.timeout, retries=CFG.snmp.retries

data/netcrawl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = 'netcrawl'
-  s.version           = '0.0.1'
+  s.version           = '0.0.2'
   s.platform          = Gem::Platform::RUBY
   s.authors           = [ 'Saku Ytti' ]
   s.email             = %w( saku@ytti.fi )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netcrawl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: snmp
@@ -74,7 +74,6 @@ files:
 - Rakefile
 - bin/netcrawl
 - lib/netcrawl.rb
-- lib/netcrawl/.cli.rb.swp
 - lib/netcrawl/cli.rb
 - lib/netcrawl/config.rb
 - lib/netcrawl/dns.rb
@@ -100,7 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -152408900674429923
+      hash: 2137776821860602171
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -109,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -152408900674429923
+      hash: 2137776821860602171
 requirements: []
 rubyforge_project: netcrawl
 rubygems_version: 1.8.25