netdisco 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ded71de342a66250ded62a3f156f5d682bf49e9e32d9b4e1dad2c29b43a2e8fc
-  data.tar.gz: fac4f4eba715ced9b239193d443012d0c73358cc9144871952a1c95595695f71
+  metadata.gz: 717c023a9db51e3af00801112bbeaf47ab48159b98db46932bfd03243fcd5965
+  data.tar.gz: 5c871ee533134fd8e9e6e840c2cb6b598b031b013979247ef529d1565d2cc7ad
 SHA512:
-  metadata.gz: 326132153b188f6383d596340638eb0da1e3126af112d5e395b4beda8be3ccb54cd2cfe37b07615a466973f9ba7c26239305e569e3780f6340f3a20436a60979
-  data.tar.gz: 7b289018e3e85556932a812632a014733b15b579134911e7aa3dfcd9fad794d7d4c79ef40d5507bdb14ff732adc6ad37489362bb96f213b1e95c6b39e616e79b
+  metadata.gz: 5f2bdf61addfe71f2bdcdeb6b0728ae36fc9453f9edcce7e74c0c158bcf8bdcb4223ca8df25967c9ebfbfaaf65b2aebe7b7ba0f4a55e27bb1e946d95e49670e7
+  data.tar.gz: bfdabe4b30c8e3e5867b42ab9f6af9efa1748df080ed09cae4c37deef316086e72808a3bffc420152031fa0238dcc23fac133f864b0061e8e6b3cd5b706d63ee

data/lib/netdisco/cli.rb

@@ -11,6 +11,7 @@ class Netdisco
 
     # 网络邻居发现入口函数
     def run
+      Log.debug "Running Netdisco.new.discover ..."
       output = Netdisco.new.discover @host
 
       # 邻居关系发现后修正处理逻辑钩子函数

data/lib/netdisco/config.rb

@@ -9,14 +9,14 @@ class Netdisco
 
   # 设置默认参数
   CONFIG.default.use            = %w(LLDP CDP)
-  CONFIG.default.poll           = %w[192.168.8.0/24]
+  CONFIG.default.poll           = %w(192.168.8.0/24 10.250.8.0/24)
   CONFIG.default.snmp.community = "cisco"
   CONFIG.default.snmp.timeout   = 15
   CONFIG.default.snmp.retries   = 1
   CONFIG.default.snmp.bulkrows  = 30 # 1500B packet should fit about 50 :cdpCacheAddress rows
   CONFIG.default.dot.bothlinks  = false # keep both a-b and b-a links
   CONFIG.default.dot.linklabels = true # label link with interface names
-  CONFIG.default.dot.color      = [# regexp of host => color
+  CONFIG.default.dot.color      = [ # regexp of host => color
     %w[cpe gold],
     %w[-sw blue],
     %w[-pe red],
@@ -25,18 +25,20 @@ class Netdisco
   CONFIG.default.dns.afi        = nil # could be 'ipv4' or 'ipv6'
   CONFIG.default.log            = "STDERR"
   CONFIG.default.debug          = true
-  CONFIG.default.name_map       = [# regexp match+sub of hostname (needed for LLDP)
+  CONFIG.default.name_map       = [ # regexp match+sub of hostname (needed for LLDP)
     ['-re\d+', ""],
     ["^KILLME(.*(?<!mojo.local)$)", '\1.mojo.local'], # adds missing domain name
   ]
   # 加载配置并设置对应常量
   CONFIG.load
   CFG = CONFIG.cfg
+
   # 设置项目日志参数
-  log       = CFG.log
-  log       = STDERR if log == "STDERR"
-  log       = STDOUT if log == "STDOUT"
-  Log       = Logger.new log
+  log = CFG.log
+  log = STDERR if log == "STDERR"
+  log = STDOUT if log == "STDOUT"
+  Log = Logger.new log
+
   Log.level = Logger::INFO
   Log.level = Logger::DEBUG if CFG.debug
 end

data/lib/netdisco/dns.rb

@@ -26,8 +26,8 @@ class Netdisco
           else
             @cache_ip[name] = Resolv.getaddress name
           end
-        rescue => error
-          Log.debug "DNS resolution for '#{name}' raised error '#{error.class}' with message '#{error.message}'"
+        rescue StandardError => e
+          Log.debug "DNS resolution for '#{name}' raised error '#{e.class}' with message '#{e.message}'"
           nil
         end
       end
@@ -42,8 +42,8 @@ class Netdisco
       else
         begin
           @cache_name[ip] = Resolv.getname ip
-        rescue => error
-          Log.debug "DNS resolution for '#{ip}' raised error '#{error.class}' with message '#{error.message}'"
+        rescue StoreError => e
+          Log.debug "DNS resolution for '#{ip}' raised error '#{e.class}' with message '#{e.message}'"
           @cache_name[ip] = ip
         end
       end

data/lib/netdisco/method/lldp.rb

@@ -37,7 +37,7 @@ class Netdisco
           peer.oid      = get_oid_hash peer_id
           ip            = @mib.by_partial(OID[:lldpRemManAddrIfSubtype], peer_id)
           peer.raw_ip   = ip.oid[-4..-1].join(".") if ip # FIXME: IPv4 specific
-          peer.raw_ip   ||= "192.0.2.255" # sometimes we can't fnd any IP (EX2200 talking Arista found)
+          peer.raw_ip ||= "192.0.2.255" # sometimes we can't fnd any IP (EX2200 talking Arista found)
           peer.raw_name = @mib[OID[:lldpRemSysName], peer_id].value
           peer.ip       = get_ip(peer.raw_ip, peer.raw_name)
           peer.dst      = @mib[OID[:lldpRemPortId], peer_id].value

data/lib/netdisco/method/xdp.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "../snmp"
+# require "logger"
 
 class Netdisco
   class XDP

data/lib/netdisco/output.rb

@@ -75,20 +75,22 @@ class Netdisco
     def to_hash
       require "pp"
       out = ""
-      PP.pp to_h, out
+      PP.pp(to_h, out)
       out
     end
 
-    # @return [String] yaml of hosts and peers found
+    # @return [String, Instance] yaml of hosts and peers found
     def to_yaml
       require "yaml"
-      YAML.dump to_h
+      File.open("./neighbors.yml", "w") { |file| file.write to_h.to_yaml }
+      YAML.dump(to_h)
     end
 
     # @return [String] json of hosts and peers found
     def to_json
       require "json"
-      JSON.pretty_generate to_h
+      JSON.generate(to_h)
+      # JSON.pretty_generate to_h
     end
   end
 end

data/lib/netdisco/snmp.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "snmp"
 
 class Netdisco
@@ -74,8 +76,8 @@ class Netdisco
     private
       def snmp(method, *args)
         @snmp.send method, *args
-      rescue ::SNMP::RequestTimeout, Errno::EACCES => error
-        msg = "host '#{@host}' raised '#{error.class}' with message '#{error.message}' for method '#{method}' with args '#{args}'"
+      rescue ::SNMP::RequestTimeout, Errno::EACCES => e
+        msg = "host '#{@host}' raised '#{e.class}' with message '#{e.message}' for method '#{method}' with args '#{args}'"
         Log.warn msg
         raise NoResponse, msg
       end

data/lib/netdisco/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Netdisco
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/netdisco.rb

@@ -59,7 +59,6 @@ class Netdisco
     # 第一步获取设备的邻居关系，同时将邻居关系缓存下来
     @hosts[host] = peers = neighbors(host)
     # 第二步遍历邻居的邻居关系
-    require "pp"; PP.pp @hosts[host]
     peers.each do |peer|
       next if @hosts.has_key? peer.ip
       next unless @poll.include? peer.ip

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: netdisco
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - WENWU.YAN
@@ -42,16 +42,16 @@ dependencies:
   name: strada
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.3
 description: Netdisco is working for network snmp discovery
 email:
 - careline@foxmail.com