pingable_ipam_plugin 0.0.5 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a74278facc95a796eaa1a5cf9122ba1869dbc3300bd17a16e919deb53fbc6206
-  data.tar.gz: cba5705fe14534f4c24734951a3fb8e809709f052b13c65ed8845b9b8d7c8c4a
+  metadata.gz: 32ff6f6ec47a972a551c4a45211160cf6a49321e97c440e9aa427fbd9e563407
+  data.tar.gz: 3b79031e72d5b4a81627e5ea0c041d88449fb4484443f39817ef940e4ad56e80
 SHA512:
-  metadata.gz: 8d9edce903ef99a98ab52e32ce97a18e9eb948c84389a5057c8faf6cd97c366d2097f4df58a90149ab477b9a9b40b14d86ffe904f3a26be74eee0796b2fe89b1
-  data.tar.gz: 8f23bf9ac404645cf6e25a16dc17c258f6e947dc2045a68cea6a61886845092c062175a4f933be1c18e69aeb57eea6ef503b24ff169d3c97a08a85a64d2dd39d
+  metadata.gz: c55c277edef4196f0585bbf84c7d00a40f97aca487fd8c026ca2f5354d7c1d7234ef11feb65fba973d0a4902cd9c6fe6bfaa798bbf068c5b0f1b50a0599df924
+  data.tar.gz: abd0bdc066e593d2051890cf0442048bfc75da6ed92397d0aebda50a1d7176e77a3f55a0032b56e9ee97540be26831e67cb1559d8d52969c04e3208a1fd46c7b

data/app/services/ipam/ping_random_db.rb

@@ -1,5 +1,6 @@
 require 'timeout'
 require 'socket'
+require 'resolv'
 
 module IPAM
   class PingRandomDb < Base
@@ -8,7 +9,7 @@ module IPAM
     end
 
     def random_ip(range)
-      IPAddr.new(generator.rand(range.first.to_i..range.last.to_i), subnet.family)
+      IPAddr.new(range.sample, subnet.family)
     end
 
     def tcp_pingable?(ip)
@@ -45,7 +46,7 @@ module IPAM
       end
 
       if bool
-        logger.info "Succesful telnet ping #{ip}, port #{port}"
+        logger.info "[IPAM] Succesful telnet ping #{ip}, port #{port}"
       end
 
       bool
@@ -63,10 +64,20 @@ module IPAM
         system("ping -c 2 -W 1 #{ip} > /dev/null")
       end
     rescue => err
-      logger.debug "Unable to icmp ping #{ip} because #{err.inspect}."
+      logger.warn "[IPAM] Unable to icmp ping #{ip} because #{err.inspect}."
       true
     end
 
+    def ns_resolvable? ip
+      begin
+        name = Resolv.getname ip
+        logger.warn "[IPAM] Found a DNS resolvable IP #{ip}, resolved name: #{name}."
+        true
+      rescue StandardError
+        false
+      end
+    end
+
     # Safety check not to spend much CPU time when there are no many free IPs left. This gives up
     # in about a second on Ryzen 1700 running with Ruby 2.4.
     MAX_ITERATIONS = 100_000
@@ -77,30 +88,39 @@ module IPAM
       range = subnet_range.to_a - excluded_ips.to_a
       range -= subnet.known_ips.to_a
 
-      if range.empty?
-        errors.add(:subnet, _('no free IP could be found in our DB, enlarge subnet range'))
-        return nil
+      unless range.empty?
+        logger.info "[IPAM] IP range from #{range.first.to_s} to #{range.last.to_s}, total: #{range.length}"
       end
 
       loop do
-        # next random IP from the sequence generated by MAC seed
+        if range.empty?
+          errors.add(:subnet, _('no free IP could be found in our DB, enlarge subnet range'))
+          return nil
+        end
+
         candidate = random_ip(range)
         iterations += 1
         break if iterations >= MAX_ITERATIONS
         # try to match it
         ip = candidate.to_s
+        logger.info "[IPAM] Searching for free IP - resolving #{ip}"
+
         # Check again if something has been changed.
         if !excluded_ips.include?(ip) && !subnet.known_ips.include?(ip)
-          logger.debug "Searching for free IP - pinging #{ip}."
           if tcp_pingable?(ip) || icmp_pingable?(ip)
-            logger.warn("Found a pingable IP (#{ip}) address which not marked as known. Skipping it...")
+            logger.warn("[IPAM] Found a pingable IP (#{ip}) address which not marked as known. Skipping it...")
           else
-            logger.debug("Found #{ip} in #{iterations} iterations")
-            return ip
+            unless ns_resolvable?(ip)
+              logger.info("[IPAM] Found #{ip} in #{iterations} iterations")
+              return ip
+            end
           end
         end
+
+        range -= [candidate]
       end
-      logger.debug("Not suggesting IP Address for #{subnet} as no free IP found in reasonable time (#{iterations} iterations)")
+
+      logger.warn("[IPAM] Not suggesting IP Address for #{subnet} as no free IP found in reasonable time (#{iterations} iterations)")
       errors.add(:subnet, _('no random free IP could be found in our DB, enlarge subnet range'))
       nil
     end

data/lib/pingable_ipam_plugin/version.rb

@@ -1,3 +1,3 @@
 module PingableIpamPlugin
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pingable_ipam_plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.10
 platform: ruby
 authors:
 - Pavel Parshin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop