smart_proxy_dhcp_infoblox 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f93a00fc3b3226cd13507406635a76d39fdf5bf
-  data.tar.gz: 2af103b766051daba129f8a05918f704692f7362
+  metadata.gz: '085837132cc0862c9f3ffc24e0e2730f8e3adbb3'
+  data.tar.gz: 0f4eba506ee80571addcd1d4a567ba71642870e3
 SHA512:
-  metadata.gz: 629785c6c921e5a356af8ab70703bc13d9db487dc3b4cdc2fb24ab1ff320d620e67b6762ff557a400cc1a77b4a73e7d7817c07591160e6d3de4011cf65abef48
-  data.tar.gz: 442344c94cb0cf17e7e8915139149be7f50c545d771e570dcc7ae921c8ae98649a2f207c72e2c91c66bfdfc655fe73ab8b1b3a9ff1191c7ed2ecf470a4118fb7
+  metadata.gz: 42aa2e6637a6e1aaef0379d205e7f59df1e1a9aa477afc0e0b51ef723ed2b4a36560daa784f3b82d303d97e4c96acd010626ca5495f806615e244503973357c1
+  data.tar.gz: 6ee6869da932c9f8ef89a4996d10644cb68ed47c06ff7891e168c6c2d1cfc9948e7fb0e004b94da78e501c3286e3b867e93c7bf277946857bc8ee9b0b5c12742

data/lib/smart_proxy_dhcp_infoblox/common_crud.rb

@@ -48,11 +48,25 @@ module ::Proxy::DHCP::Infoblox
 
     def del_record(_, record)
       raise InvalidRecord, "#{record} is static - unable to delete" unless record.deleteable?
-      found = find_host('ipv4addr' => record.ip)
+      found = find_hosts('ipv4addr' => record.ip).first
       return if found.nil?
       found.delete
     end
 
+    def del_records_by_ip(ip_address)
+      found = find_hosts({'ipv4addr' => ip_address}, 2147483646)
+      return if found.empty?
+      found.each {|record| record.delete}
+      nil
+    end
+
+    def del_record_by_mac(mac_address)
+      found = find_hosts('mac' => mac_address).first
+      return if found.nil?
+      found.delete
+      nil
+    end
+
     def build_reservation(name, host, full_subnet_address)
       return nil if host.nil?
       return nil if name.nil? || name.empty?
@@ -60,16 +74,14 @@ module ::Proxy::DHCP::Infoblox
       return nil if host.mac.nil? || host.mac.empty?
 
       opts = { :hostname => name }
-      opts[:mac] = host.mac
-      opts[:ip] = host.ipv4addr
       opts[:deleteable] = true
       # TODO: nextserver, use_nextserver, bootfile, and use_bootfile attrs exist but are not available in the Fixedaddress model
       # Might be useful to extend the model to include these
       opts[:nextServer] = host.nextserver if (host.respond_to?(:use_nextserver) && host.use_nextserver)
       opts[:filename] = host.bootfile if (host.respond_to?(:use_bootfile) && host.use_bootfile)
-      opts[:subnet] = ::Proxy::DHCP::Subnet.new(full_subnet_address.split('/').first, cidr_to_ip_mask(cidr_to_i(full_subnet_address.split('/').last)))
+      subnet = ::Proxy::DHCP::Subnet.new(full_subnet_address.split('/').first, cidr_to_ip_mask(cidr_to_i(full_subnet_address.split('/').last)))
 
-      Proxy::DHCP::Reservation.new(opts)
+      Proxy::DHCP::Reservation.new(name, host.ipv4addr, host.mac, subnet, opts)
     end
   end
 end

data/lib/smart_proxy_dhcp_infoblox/dhcp_infoblox_main.rb

@@ -18,8 +18,6 @@ module Proxy::DHCP::Infoblox
     end
 
     def find_subnet(address);::Proxy::DHCP::Subnet.new(address, '255.255.255.0'); end
-    def load_subnets; end
-    def load_subnet_data(_); end
 
     def subnets
       ::Infoblox::Network.all(connection).map do |network|
@@ -41,20 +39,40 @@ module Proxy::DHCP::Infoblox
       crud.find_record(full_network_address(subnet_address), an_address)
     end
 
+    def find_record_by_mac(subnet_address, mac_address)
+      crud.find_record_by_mac(full_network_address(subnet_address), mac_address)
+    end
+
+    def find_records_by_ip(subnet_address, ip_address)
+      crud.find_records_by_ip(full_network_address(subnet_address), ip_address)
+    end
+
     def add_record(options)
       crud.add_record(options)
       logger.debug("Added DHCP reservation for #{options[:ip]}/#{options[:mac]}")
       restart_grid.try_restart
     end
 
-    def del_record(subnet, record)
-      crud.del_record(full_network_address(subnet.network), record)
+    def del_record(record)
+      crud.del_record(full_network_address(record.subnet_address), record)
       logger.debug("Removed DHCP reservation for #{record.ip} => #{record}")
       restart_grid.try_restart
     end
 
+    def del_record_by_mac(_, mac_address)
+      crud.del_record_by_mac(mac_address)
+      logger.debug("Removed DHCP reservation for #{mac_address}")
+      restart_grid.try_restart
+    end
+
+    def del_records_by_ip(_, ip_address)
+      crud.del_records_by_ip(ip_address)
+      logger.debug("Removed DHCP reservation(s) for #{ip_address}")
+      restart_grid.try_restart
+    end
+
     def unused_ip(subnet, _, from_ip_address, to_ip_address)
-      unused_ips.unused_ip(subnet.network, from_ip_address, to_ip_address)
+      unused_ips.unused_ip(subnet, from_ip_address, to_ip_address)
     end
 
     def find_network(network_address)

data/lib/smart_proxy_dhcp_infoblox/dhcp_infoblox_version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module DHCP
     module Infoblox
-      VERSION = '0.0.5'
+      VERSION = '0.0.6'
     end
   end
 end

data/lib/smart_proxy_dhcp_infoblox/fixed_address_crud.rb

@@ -3,7 +3,7 @@ require 'smart_proxy_dhcp_infoblox/common_crud'
 module ::Proxy::DHCP::Infoblox
   class FixedAddressCRUD < CommonCRUD
     def initialize(connection)
-      @memoized_host = nil
+      @memoized_hosts = []
       @memoized_condition = nil
       super
     end
@@ -14,26 +14,32 @@ module ::Proxy::DHCP::Infoblox
     end
 
     def find_record_by_ip(subnet_address, ip_address)
-      found = find_host('ipv4addr' => ip_address)
+      found = find_hosts('ipv4addr' => ip_address).first
       return nil if found.nil?
       build_reservation(found.name, found, subnet_address)
     end
 
+    def find_records_by_ip(subnet_address, ip_address)
+      found = find_hosts({'ipv4addr' => ip_address}, 2147483646)
+      return [] if found.empty?
+      found.map {|record| build_reservation(record.name, record, subnet_address)}
+    end
+
     def find_record_by_mac(subnet_address, mac_address)
-      found = find_host('mac' => mac_address)
+      found = find_hosts('mac' => mac_address).first
       return nil if found.nil?
       build_reservation(found.name, found, subnet_address)
     end
 
-    def find_host(condition)
-      return @memoized_host if (!@memoized_host.nil? && @memoized_condition == condition)
+    def find_hosts(condition, max_results = 1)
+      return @memoized_hosts if (!@memoized_host.empty? && @memoized_condition == condition)
       @memoized_condition = condition
-      @memoized_host = ::Infoblox::Fixedaddress.find(@connection, condition.merge('_max_results' => 1)).first
+      @memoized_hosts = ::Infoblox::Fixedaddress.find(@connection, condition.merge('_max_results' => max_results))
     end
 
     def find_host_and_name_by_ip(ip_address)
-      h = find_host('ipv4addr' => ip_address)
-      [h.name, h]
+      h = find_hosts('ipv4addr' => ip_address).first
+      h.nil? ? [nil, nil] : [h.name, h]
     end
 
     def build_host(options)
@@ -41,12 +47,10 @@ module ::Proxy::DHCP::Infoblox
       host.name = options[:hostname]
       host.ipv4addr = options[:ip]
       host.mac = options[:mac]
-      # TODO: nextserver, use_nextserver, bootfile, and use_bootfile attrs exist but are not available in the model
-      # Might be useful to extend the model to include these
-      #host.nextserver = options[:nextServer]
-      #host.use_nextserver = true
-      #host.bootfile = options[:filename]
-      #host.use_bootfile = true
+      host.nextserver = options[:nextServer]
+      host.use_nextserver = true
+      host.bootfile = options[:filename]
+      host.use_bootfile = true
       host
     end
   end

data/lib/smart_proxy_dhcp_infoblox/host_ipv4_address_crud.rb

@@ -4,7 +4,7 @@ require 'smart_proxy_dhcp_infoblox/network_address_range_regex_generator'
 module ::Proxy::DHCP::Infoblox
   class HostIpv4AddressCRUD < CommonCRUD
     def initialize(connection)
-      @memoized_host = nil
+      @memoized_hosts = []
       @memoized_condition = nil
       super
     end
@@ -22,26 +22,32 @@ module ::Proxy::DHCP::Infoblox
     end
 
     def find_record_by_ip(subnet_address, ip_address)
-      found = find_host('ipv4addr' => ip_address)
+      found = find_hosts('ipv4addr' => ip_address).first
       return nil if found.nil?
       build_reservation(found.name, found.ipv4addrs.find {|ip| ip.ipv4addr == ip_address}, subnet_address)
     end
 
+    def find_records_by_ip(subnet_address, ip_address)
+      found = find_hosts({'ipv4addr' => ip_address}, 2147483646)
+      return [] if found.empty?
+      found.map {|record| build_reservation(record.name, record.ipv4addrs.find {|ip| ip.ipv4addr == ip_address}, subnet_address)}
+    end
+
     def find_record_by_mac(subnet_address, mac_address)
-      found = find_host('mac' => mac_address)
+      found = find_hosts('mac' => mac_address).first
       return nil if found.nil?
       build_reservation(found.name, found.ipv4addrs.find {|ip| ip.mac == mac_address}, subnet_address)
     end
 
     def find_host_and_name_by_ip(ip_address)
-      h = find_host('ipv4addr' => ip_address)
-      [h.name, h.ipv4addrs.find {|ip| ip.ipv4addr == ip_address}]
+      h = find_hosts('ipv4addr' => ip_address).first
+      h.nil? ? [nil, nil] : [h.name, h.ipv4addrs.find {|ip| ip.ipv4addr == ip_address}]
     end
 
-    def find_host(condition)
-      return @memoized_host if (!@memoized_host.nil? && @memoized_condition == condition)
+    def find_hosts(condition, max_results = 1)
+      return @memoized_hosts if (!@memoized_hosts.empty? && @memoized_condition == condition)
       @memoized_condition = condition
-      @memoized_host = ::Infoblox::Host.find(@connection, condition.merge('_max_results' => 1)).first
+      @memoized_hosts = ::Infoblox::Host.find(@connection, condition.merge('_max_results' => max_results))
     end
 
     def build_host(options)

data/lib/smart_proxy_dhcp_infoblox/unused_ips.rb

@@ -9,6 +9,7 @@ module Proxy::DHCP::Infoblox
     def initialize(connection, use_ranges)
       @connection = connection
       @use_ranges = use_ranges
+      @memoized_network = nil
     end
 
     def unused_ip(network_address, from_ip_address, to_ip_address)

data/test/host_and_fixedaddress_crud_test.rb

@@ -16,6 +16,11 @@ module CommoncrudTests
     assert_nil @crud.find_record_by_ip('192.168.42.0/24', '192.168.42.1')
   end
 
+  def test_find_records_using_ip_returns_empty_arrays_if_records_not_found
+    @entity.expects(:find).with(@connection, 'ipv4addr' => '192.168.42.1', '_max_results' => 2147483646).returns([])
+    assert @crud.find_records_by_ip('192.168.42.0/24', '192.168.42.1').empty?
+  end
+
   def test_find_record_using_mac
     @entity.expects(:find).with(@connection, 'mac' => '00:01:02:03:05:06', '_max_results' => 1).returns([@host])
     assert_equal @reservation, @crud.find_record_by_mac('192.168.42.0/24', '00:01:02:03:05:06')
@@ -46,16 +51,29 @@ module CommoncrudTests
   def test_add_record_with_already_existing_host
     @crud.expects(:build_host).with(:ip => @ip, :mac => @mac, :hostname => @hostname).returns(@host)
     @host.expects(:post).raises(Infoblox::Error.new("IB.Data.Conflict"))
-    @crud.expects(:find_host).with('ipv4addr' => @ip).returns(@host)
+    @crud.expects(:find_hosts).with('ipv4addr' => @ip).returns([@host])
 
     assert_raises(Proxy::DHCP::AlreadyExists) { @crud.add_record(:ip => @ip, :mac => @mac, :hostname => @hostname) }
   end
 
   def test_del_record
-    @crud.expects(:find_host).with('ipv4addr' => @ip).returns(@host)
+    @crud.expects(:find_hosts).with('ipv4addr' => @ip).returns([@host])
     @host.expects(:delete)
     @crud.del_record('unused', @reservation)
   end
+
+  def test_del_records_by_ip
+    @crud.expects(:find_hosts).with({'ipv4addr' => @ip}, 2147483646).returns([@host, @host1])
+    @host.expects(:delete)
+    @host1.expects(:delete)
+    @crud.del_records_by_ip(@ip)
+  end
+
+  def test_del_record_by_mac
+    @crud.expects(:find_hosts).with('mac' => @mac).returns([@host])
+    @host.expects(:delete)
+    @crud.del_record_by_mac(@mac)
+  end
 end
 
 class HostCrudTest < Test::Unit::TestCase
@@ -72,16 +90,20 @@ class HostCrudTest < Test::Unit::TestCase
     @nextserver = '192.168.42.1'
     @filename = '/tftpboot.img'
     @ip = '192.168.42.1'
+    @subnet_ip = '192.168.42.0'
 
     @host = ::Infoblox::Host.new(
         :name => @hostname,
         :ipv4addrs => [{:ipv4addr => @ip, :mac => @mac, :nextserver => @nextserver, :use_nextserver => true,
                         :bootfile => @filename, :use_bootfile => true, :configure_for_dhcp => true}])
+    @host1 = ::Infoblox::Host.new(
+        :name => 'another.test.com',
+        :ipv4addrs => [{:ipv4addr => @ip, :mac => '00:01:02:03:05:07', :nextserver => @nextserver, :use_nextserver => true,
+                        :bootfile => @filename, :use_bootfile => true, :configure_for_dhcp => true}])
 
-    @reservation = ::Proxy::DHCP::Reservation.new(
-        :hostname => @hostname, :mac => @mac, :ip => @ip, :nextServer => @nextserver,
-        :filename => @filename, :deleteable => true,
-        :subnet => ::Proxy::DHCP::Subnet.new('192.168.42.0', '255.255.255.0'))
+    @reservation = ::Proxy::DHCP::Reservation.new(@hostname, @ip, @mac, ::Proxy::DHCP::Subnet.new(@subnet_ip, '255.255.255.0'),
+                                                  :hostname => @hostname, :nextServer => @nextserver, :filename => @filename,
+                                                  :deleteable => true)
   end
 
   def test_all_hosts
@@ -111,8 +133,8 @@ class HostCrudTest < Test::Unit::TestCase
   def test_add_record_with_collision
     @crud.expects(:build_host).with(:ip => @ip, :mac => @mac, :hostname => @hostname).returns(@host)
     @host.expects(:post).raises(Infoblox::Error.new("IB.Data.Conflict"))
-    @crud.expects(:find_host).with('ipv4addr' => @ip).returns(
-        ::Infoblox::Host.new(:name => @hostname, :ipv4addrs => [{:ipv4addr => @ip, :mac => '11:22:33:44:55:66', :configure_for_dhcp => true}]))
+    @crud.expects(:find_hosts).with('ipv4addr' => @ip).returns(
+        [::Infoblox::Host.new(:name => @hostname, :ipv4addrs => [{:ipv4addr => @ip, :mac => '11:22:33:44:55:66', :configure_for_dhcp => true}])])
 
     assert_raises(Proxy::DHCP::Collision) { @crud.add_record(:ip => @ip, :mac => @mac, :hostname => @hostname) }
   end
@@ -130,14 +152,17 @@ class FixedaddressCrudTest < Test::Unit::TestCase
     @nextserver = '192.168.42.1'
     @filename = '/tftpboot.img'
     @ip = '192.168.42.1'
+    @subnet_ip = '192.168.42.0'
 
     @host = ::Infoblox::Fixedaddress.new(
         :name => @hostname,
         :ipv4addr => @ip, :mac => @mac) # :ipv4addr => @ip, :mac => @mac) #
+    @host1 = ::Infoblox::Fixedaddress.new(
+        :name => 'another.test.com',
+        :ipv4addr => @ip, :mac => '00:01:02:03:05:07')
 
-    @reservation = ::Proxy::DHCP::Reservation.new(
-        :hostname => @hostname, :mac => @mac, :ip => @ip, :deleteable => true,
-        :subnet => ::Proxy::DHCP::Subnet.new('192.168.42.0', '255.255.255.0'))
+    @reservation = ::Proxy::DHCP::Reservation.new(@hostname, @ip, @mac, ::Proxy::DHCP::Subnet.new(@subnet_ip, '255.255.255.0'),
+                                                  :deleteable => true, :hostname => @hostname)
   end
 
   def test_all_hosts
@@ -152,17 +177,17 @@ class FixedaddressCrudTest < Test::Unit::TestCase
     assert_equal @host.name, built.name
     assert_equal @host.ipv4addr, built.ipv4addr
     assert_equal @host.mac, built.mac
-#    assert @host.nextserver, built.nextserver
-#    assert built.use_nextserver
-#    assert_equal @host.bootfile, built.bootfile
-#    assert built.use_bootfile
+    assert_equal @nextserver, built.nextserver
+    assert built.use_nextserver
+    assert_equal @filename, built.bootfile
+    assert built.use_bootfile
   end
 
   def test_add_record_with_collision
     @crud.expects(:build_host).with(:ip => @ip, :mac => @mac, :hostname => @hostname).returns(@host)
     @host.expects(:post).raises(Infoblox::Error.new("IB.Data.Conflict"))
-    @crud.expects(:find_host).with('ipv4addr' => @ip).returns(
-        ::Infoblox::Fixedaddress.new(:name => @hostname, :ipv4addr => @ip, :mac => '11:22:33:44:55:66'))
+    @crud.expects(:find_hosts).with('ipv4addr' => @ip).returns(
+        [::Infoblox::Fixedaddress.new(:name => @hostname, :ipv4addr => @ip, :mac => '11:22:33:44:55:66')])
 
     assert_raises(Proxy::DHCP::Collision) { @crud.add_record(:ip => @ip, :mac => @mac, :hostname => @hostname) }
   end

data/test/infoblox_provider_test.rb

@@ -52,10 +52,19 @@ class InfobloxProviderTest < Test::Unit::TestCase
     @crud.stubs(:del_record)
     @provider.stubs(:full_network_address)
     @restart_grid.expects(:try_restart)
-    @provider.del_record(@subnet,
-                         ::Proxy::DHCP::Record.new(:name => 'test',
-                                                   :ip => '192.168.42.1',
-                                                   :mac => '00:01:02:03:04:05',
-                                                   :subnet => ::Proxy::DHCP::Subnet.new('192.168.42.0', '255.255.255.0')))
+    @provider.del_record(::Proxy::DHCP::Record.new('192.168.42.1', '00:01:02:03:04:05',
+                                                   ::Proxy::DHCP::Subnet.new('192.168.42.0', '255.255.255.0')))
+  end
+
+  def test_del_record_by_mac_restarts_grid
+    @crud.stubs(:del_record_by_mac)
+    @restart_grid.expects(:try_restart)
+    @provider.del_record_by_mac(@subnet.network, '00:01:02:03:04:05')
+  end
+
+  def test_del_record_by_ip_restarts_grid
+    @crud.stubs(:del_records_by_ip)
+    @restart_grid.expects(:try_restart)
+    @provider.del_records_by_ip(@subnet.network, '192.168.42.1')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dhcp_infoblox
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Klaas Demter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-12 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies: []
 description: Infoblox DHCP provider plugin for Foreman's smart proxy
 email:
@@ -43,7 +43,7 @@ files:
 - test/unused_ip_test.rb
 homepage: https://github.com/theforeman/smart_proxy_dhcp_infoblox
 licenses:
-- GPLv3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -61,15 +61,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Infoblox DHCP provider plugin for Foreman's smart proxy
 test_files:
-- test/host_and_fixedaddress_crud_test.rb
-- test/infoblox_provider_test.rb
 - test/plugin_configuration_test.rb
+- test/unused_ip_test.rb
+- test/host_and_fixedaddress_crud_test.rb
 - test/record_type_validator_test.rb
-- test/regex_generator_test.rb
 - test/test_helper.rb
-- test/unused_ip_test.rb
+- test/infoblox_provider_test.rb
+- test/regex_generator_test.rb