netdisco 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f248866c4d078dcd262c82797f0e223bae293298f70227c3a31dda566f2a599
-  data.tar.gz: acd07c7a195df2cd699ec4a1d5b9a09758e8f76d36281326e82ac72d0ac07cbc
+  metadata.gz: 4c91ccb28a783f01a278330f992be27b4140dcf51e33641ce5c816dad23bf1ec
+  data.tar.gz: 8213e835413e5c911d6e0517f3fe1ae280213106ca6f731286af2d2fb88288ef
 SHA512:
-  metadata.gz: 5858604f9f9ba1cae49b8b5ff306745454f0380bcee6356e1ca4f1a92a91ae616bc54ee960c8bd35fc0e15e5e335296fbf05bba5d3101e5b74bf5b380226ac3c
-  data.tar.gz: 10456d87f6a2e838e555f5fa1e9fb024ff67566694fb3dbaff993d6b1bb686934b443075db38ef8fbd64e498b8c09dddcf9031f0c4510041a9e89cb9ca46cd66
+  metadata.gz: c880e02f87cc3e7865ed0d7cc7b40bafc3ddcb210c14b032cf45e4e95b254eb8cc3caaa61b4e2c4b1d0406c5aa81b211efdaec359c2b2aefe1121fc8dc7cc3b4
+  data.tar.gz: 929893de09c7024f630978ddf669d2b4f05cf5614e27de68226d7c8fa64ffdcb40bfa86e16210061625f2171c6b57f314925de535805572bba715106780c59fa

data/{LICENSE.txt → LICENSE}

@@ -1,6 +1,6 @@
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2022 WENWU.YAN
+Copyright (c) 2022 WENWU YAN
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +9,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

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.3"
+  VERSION = "0.0.6"
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: netdisco
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - WENWU.YAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-16 00:00:00.000000000 Z
+date: 2022-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: snmp
@@ -42,16 +42,16 @@ dependencies:
   name: strada
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 0.0.5
 description: Netdisco is working for network snmp discovery
 email:
 - careline@foxmail.com
@@ -62,7 +62,7 @@ extra_rdoc_files: []
 files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - bin/netdisco