pingable_ipam_plugin 0.0.4 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aeceeb843ba71802fb376e640611a2cbfeb6930ca5d5ed53322d5ff1443b522b
-  data.tar.gz: c1f5ab6782c6284e681d504b3c2ba59117f607dc97113227c5569f318d15f7cc
+  metadata.gz: 22f73c17ff2eb460277f3f6cc52b3f903a6fb7b23a2d8802d8e267e25bf06dca
+  data.tar.gz: beea45db1643011ed3fa73e20b402dc4220b39a02cac919a9d9189a95833dedb
 SHA512:
-  metadata.gz: 183012661a3052bc4d8377c3e5b1776bd7cd9105e517e7abd77d95caf464517f397c3c885c01373011c8d98a33e835620e595c730f0ca0e5653d283f40685ff5
-  data.tar.gz: a8eb59ddf63772f174ce842bef1da3fcc6d365894489d4c392f776093a50ac09e78feac5cc162b4310646c82e1f97278e5ecb75d00193fff6738d3fe1b252faa
+  metadata.gz: 349bbd435aac85475b7b4cba9e5955b4a865d0707a3fa41af6a08dae2c2e7f31c698b581d3d5ecd657954f547a77f2c5350a59ba96be25a4cc6b8f5e5150dd78
+  data.tar.gz: b9e222bb00880333c6a8b77723ff529d15ecd54d9eb99d54b8f9ae47165da4104caefab17095831b0a4768b73f306a833e89506163a090537abe940bcfb009e8

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,25 +88,39 @@ module IPAM
       range = subnet_range.to_a - excluded_ips.to_a
       range -= subnet.known_ips.to_a
 
+      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 -= [ip]
       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.4'.freeze
+  VERSION = '0.0.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pingable_ipam_plugin
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.9
 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