pingable_ipam_plugin 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98f252592af66182ea5caa67ee7e6277b0d6c9a93a746b28c2f949cc13019176
-  data.tar.gz: f5e007d453bd182a85d3e20bf0441c5276ae9365d9267fe9c8541d2fa187d731
+  metadata.gz: aeceeb843ba71802fb376e640611a2cbfeb6930ca5d5ed53322d5ff1443b522b
+  data.tar.gz: c1f5ab6782c6284e681d504b3c2ba59117f607dc97113227c5569f318d15f7cc
 SHA512:
-  metadata.gz: 001c810cfc73df2a3a3cf0d767b63c5e13f1b53d29d536d13248ee045ec26cf804474c7e71f903f70814d9143ddd431182d5b362b7a1317744ed336984f09542
-  data.tar.gz: 648e49b2f2884c8bdce12f7bb79b6df125f2d8c32d7cc4bb8c4ea272b063f712c9e881593b51974a35d8bcd178f9742447c3752908a3dd9602c35872156ca26e
+  metadata.gz: 183012661a3052bc4d8377c3e5b1776bd7cd9105e517e7abd77d95caf464517f397c3c885c01373011c8d98a33e835620e595c730f0ca0e5653d283f40685ff5
+  data.tar.gz: a8eb59ddf63772f174ce842bef1da3fcc6d365894489d4c392f776093a50ac09e78feac5cc162b4310646c82e1f97278e5ecb75d00193fff6738d3fe1b252faa

data/app/services/ipam/ping_random_db.rb

@@ -7,8 +7,8 @@ module IPAM
       @generator ||= Random.new(mac ? mac.delete(':').to_i(16) : Random.new_seed)
     end
 
-    def random_ip
-      IPAddr.new(generator.rand(subnet_range.first.to_i..subnet_range.last.to_i), subnet.family)
+    def random_ip(range)
+      IPAddr.new(generator.rand(range.first.to_i..range.last.to_i), subnet.family)
     end
 
     def tcp_pingable?(ip)
@@ -32,30 +32,16 @@ module IPAM
       # Whether or not Errno::ECONNREFUSED is considered a successful ping
       @service_check = true
       @timeout = 1
-      @exception = nil
       bool = false
-      tcp = nil
 
       begin
-        Timeout.timeout(@timeout) do
-          begin
-            tcp = TCPSocket.new(ip, port)
-          rescue Errno::ECONNREFUSED => err
-            if @service_check
-              bool = true
-            else
-              @exception = err
-            end
-          rescue Exception => err
-            @exception = err
-          else
-            bool = true
-          end
+        bool = Socket.tcp(ip, port, connect_timeout: @timeout) { true }
+      rescue Errno::ECONNREFUSED
+        if @service_check
+          bool = true
         end
-      rescue Timeout::Error => err
-        @exception = err
-      ensure
-        tcp.close if tcp
+      rescue Exception
+        bool = false
       end
 
       if bool
@@ -87,13 +73,18 @@ module IPAM
 
     def suggest_ip
       iterations = 0
+      # Remove IPs already excluded or known.
+      range = subnet_range.to_a - excluded_ips.to_a
+      range -= subnet.known_ips.to_a
+
       loop do
         # next random IP from the sequence generated by MAC seed
-        candidate = random_ip
+        candidate = random_ip(range)
         iterations += 1
         break if iterations >= MAX_ITERATIONS
         # try to match it
         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}."
           if tcp_pingable?(ip) || icmp_pingable?(ip)

data/lib/pingable_ipam_plugin/version.rb

@@ -1,3 +1,3 @@
 module PingableIpamPlugin
-  VERSION = '0.0.3'.freeze
+  VERSION = '0.0.4'.freeze
 end

metadata

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