smart_proxy_dhcp_infoblox 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a07a8c599733c506c451ce081884584dc9501eb
-  data.tar.gz: a07bed8a8a3b384a5670cff0c0c0f72005ebbc17
+  metadata.gz: 158f2e07407799d7f26f84493be677087f46d61a
+  data.tar.gz: e94a02ad181dab62027fc1cd50ae3cc080cdcb7f
 SHA512:
-  metadata.gz: b3156dbd4113a50c8c48a5305813ddd290336478ab5ab64dccc94b084a9972bd11e403e4c064970f11196400bedb1b2569856f9ae284defecd840173cad5db62
-  data.tar.gz: 99715f24471a04a0d0126e1f750ea23d66e88dbef2d5d956e5ca1cb2574ee34673fdbc636aa784fdcd83e05d35805bb852ada89b813dcf69f45b307dbfd15855
+  metadata.gz: 22d13b1f5077bbf79b9f11fcc49b4be0eff7f6f11b75bd3489d4e2665a514937f02f8d3e6d7a9188d55fb380408601d9b0628b41480f92dce47cc3dc8d77801b
+  data.tar.gz: 725b239a63a1ddfd0e7416f3b4e81b55717f67d9eca5da3c0ab147f12d340f8a4946643a5c16f6e26c62cbb42d6c335ff03d614822294f95844c18e2fb55eb60

data/lib/smart_proxy_dhcp_infoblox/dhcp_infoblox_version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module DHCP
     module Infoblox
-      VERSION = '0.0.8'
+      VERSION = '0.0.9'
     end
   end
 end

data/lib/smart_proxy_dhcp_infoblox/fixed_address_crud.rb

@@ -26,7 +26,8 @@ module ::Proxy::DHCP::Infoblox
     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)}
+      to_return = found.map {|record| build_reservation(record.name, record, subnet_address)}
+      to_return.compact
     end
 
     def find_record_by_mac(subnet_address, mac_address)

data/lib/smart_proxy_dhcp_infoblox/host_ipv4_address_crud.rb

@@ -34,7 +34,8 @@ module ::Proxy::DHCP::Infoblox
     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)}
+      to_return = found.map {|record| build_reservation(record.name, record.ipv4addrs.find {|ip| ip.ipv4addr == ip_address}, subnet_address)}
+      to_return.compact
     end
 
     def find_record_by_mac(subnet_address, mac_address)

data/test/host_and_fixedaddress_crud_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'ostruct'
 require 'infoblox'
 require 'dhcp_common/dhcp_common'
 require 'dhcp_common/record/reservation'
@@ -21,6 +22,16 @@ module CommoncrudTests
     assert @crud.find_records_by_ip('192.168.42.0/24', '192.168.42.1').empty?
   end
 
+  def test_find_records_by_ip_returns_empty_array_when_host_has_no_dhcp_record
+    found_record = OpenStruct.new(:name => 'testing',
+                                  :ipv4addrs => [OpenStruct.new(:ipv4addr => '192.168.42.1',
+                                                                :mac => '00:01:02:03:04:05',
+                                                                :configure_for_dhcp => false)])
+    @entity.expects(:find).
+        with(@connection, search_condition('ipv4addr' => '192.168.42.1', '_max_results' => 2147483646)).returns([found_record])
+    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, search_condition('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')
@@ -150,6 +161,8 @@ class HostCrudTest < Test::Unit::TestCase
 end
 
 class FixedaddressCrudTest < Test::Unit::TestCase
+  include CommoncrudTests
+
   def setup
     @connection = Object.new
     @network_view = "something"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dhcp_infoblox
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Klaas Demter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies: []
 description: Infoblox DHCP provider plugin for Foreman's smart proxy
 email:
@@ -61,15 +61,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Infoblox DHCP provider plugin for Foreman's smart proxy
 test_files:
+- test/infoblox_provider_test.rb
 - test/plugin_configuration_test.rb
-- test/unused_ip_test.rb
-- test/host_and_fixedaddress_crud_test.rb
+- test/regex_generator_test.rb
 - test/record_type_validator_test.rb
 - test/test_helper.rb
-- test/infoblox_provider_test.rb
-- test/regex_generator_test.rb
+- test/unused_ip_test.rb
+- test/host_and_fixedaddress_crud_test.rb