smart_proxy_dhcp_infoblox 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9d476422505f0de1b398cec16d1dc065b5906e9
-  data.tar.gz: 59b2f67f873701ffc0e21a4f553cf50c055f627d
+  metadata.gz: a6a4ca3969027de5275b0b1bceb2a61900d33286
+  data.tar.gz: dea402d92c6936893c77c25a80e11591ea2d3aa3
 SHA512:
-  metadata.gz: 169b3d6d58d49639054c06b65f7bd4f2ea847b0e01f5569db7a80e1b7750b220aceee8d8cf295010f87c0a9f80b870120f18042a6867c03173e709ef2809504b
-  data.tar.gz: 5ba39c49492d1ac3c7a6c90ed30737b0549f3a406e7b9396245561f805c12a9fdb1445ae5598420a9ace11b699bb122e4ed7fbc00638dbfd94b4bda27cb04f68
+  metadata.gz: 9b0c9339057157d473c3db84aefa42565a14f3a1dd050653fae39d93ce9d8a10684adb813d311ec4046f3b9e81f8b6a731f6cb1d75b38693f328f16f8fbff349
+  data.tar.gz: 140aed657e449dc0104586d4d3f1084aea9bbbf06d6c731c42720af190b152b07f9ba177c8fb13c4e8eee28aa89a102969449dcf1edc4a68b52f6edf1dd845dc

data/lib/smart_proxy_dhcp_infoblox/dhcp_infoblox_main.rb

@@ -1,5 +1,6 @@
 require 'dhcp_common/server'
 require 'infoblox'
+require 'ipaddr'
 
 module Proxy::DHCP::Infoblox
   class Provider < ::Proxy::DHCP::Server
@@ -100,10 +101,29 @@ module Proxy::DHCP::Infoblox
       # returns first available ip address in a subnet with network_address, for a host with mac_address, in the range of ip addresses: from_ip_address, to_ip_address
       # Deliberatly ignoring everything but first argument
       logger.debug "Infoblox unused_ip Network_address: #{network_address} #{mac_address}, #{from_ip_address}, #{to_ip_address}"
-      if @range 
-        ::Infoblox::Range.find(@connection, network: "#{network_address.network}/#{network_address.cidr}").first.next_available_ip
+      #next_available_ip can take a number to return (1), and an array of ips to exclude. So, we need to:
+      #build a list of all ips in the network (all_addresses)
+      #build a list of all ips in between from_ip_address and to_ip_address (include_addresses)
+      #remove all of the from_ip_address and to_ip_address from the all_address (exclude_addresses)
+      #and call next_available_ip with exclude_addresses passed
+      all_addresses = Array.new
+      net=IPAddr.new("#{network_address.network}/#{network_address.cidr}")
+      net.to_range.each do |ip|
+        all_addresses.push(ip.to_s)
+      end
+      range_start=IPAddr.new(from_ip_address)
+      range_stop=IPAddr.new(to_ip_address)
+      included_addresses=Array.new
+      (range_start..range_stop).each do |ip|
+        included_addresses.push(ip.to_s)
+      end
+      excluded_addresses=all_addresses-included_addresses
+      #excluded_addresses is now an array of ips containing all the ips from the network not between from, and to_ip_address
+
+      if @range
+        ::Infoblox::Range.find(@connection, network: "#{network_address.network}/#{network_address.cidr}").first.next_available_ip(1,excluded_addresses)
       else
-        ::Infoblox::Network.find(@connection, network: "#{network_address.network}/#{network_address.cidr}").first.next_available_ip
+        ::Infoblox::Network.find(@connection, network: "#{network_address.network}/#{network_address.cidr}").first.next_available_ip(1,excluded_addresses)
       end
       # Idea for randomisation in case of concurrent installs:
       #::Infoblox::Network.find(@connection, network: "#{network_address.network}/#{network_address.cidr}").first.next_available_ip(15).sample

data/lib/smart_proxy_dhcp_infoblox/dhcp_infoblox_version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module DHCP
     module Infoblox
-      VERSION = '0.0.2'
+      VERSION = '0.0.3'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dhcp_infoblox
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Klaas Demter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Infoblox DHCP provider plugin for Foreman's smart proxy