pingable_ipam_plugin 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 908ad71e7072a4b86a8f72b60fe937148dc4053638fa4044e6949c1e48ce17b8
-  data.tar.gz: 310482875a9873683c62e72e36e074307f0f7053c12a93f1f863a44c60b348a9
+  metadata.gz: afb4f76ebb1e0b6ba231a0a52e696e78728abd2eb38ef75946397fc3531e4114
+  data.tar.gz: 402d327725e8605041658ba455b869f38ab09edc327d359e81b89155850c4194
 SHA512:
-  metadata.gz: d825d67a8ba86b77486e86caeb2ac58f7d8bb987a05f5e98ee2a5ff6b5ce15fa4fc6e904455d68ccaf12eadb9f893fa26b59754d5bccf0acd16eaf11e0e66141
-  data.tar.gz: a223b1c4aa23c8eb969122dfa3c2252183a99c2853244ce95a1501ba290f6938043a9698add803650b9c79e7394100132682a78e0be26ac93958c65b2c77b141
+  metadata.gz: 5755029b6b0c67cd28260d1e05715ac34fd04317cff271d9db4067e4f5094159c515da6a9bda1664586b95ba4deca91809542a080551ad49d3d521ec5fde4170
+  data.tar.gz: 2a8ccfb8448d928be6bd31a20a3db1a531c3fbe32e8baeabacc266570fe026f98035fbbdba9984e5e000d736b09f923d8faff018edc02b56ddbd96baeb604c32

data/app/services/ipam/ping_random_db.rb

@@ -46,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
@@ -64,14 +64,14 @@ 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 "Found a DNS resolvable IP #{ip}, resolved name: #{name}."
+        logger.warn "[IPAM] Found a DNS resolvable IP #{ip}, resolved name: #{name}."
         true
       rescue StandardError
         false
@@ -88,12 +88,16 @@ 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}"
       end
 
       loop do
+        if range.empty?
+          errors.add(:subnet, _('no free IP could be found in our DB, enlarge subnet range'))
+          return nil
+        end
+
         # next random IP from the sequence generated by MAC seed
         candidate = random_ip(range)
         iterations += 1
@@ -102,18 +106,21 @@ module IPAM
         ip = candidate.to_s
         # 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}."
+          logger.info "[IPAM] Searching for free IP - resolving #{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
             unless ns_resolvable?(ip)
-              logger.debug("Found #{ip} in #{iterations} iterations")
+              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.6'.freeze
+  VERSION = '0.0.7'.freeze
 end

metadata

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