smart_proxy_dhcp_infoblox 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c031d153855f68611243ce742482f2c3e0274ad9187dc638cb4f691b3d687448
-  data.tar.gz: 330d031ca651443261dd0df8921577f4c545e2aba97018d42953b71178ed1aae
+  metadata.gz: 386bb53985d3965e87d2ed0b4928858efe542d1a6bc28e1147795aae21871691
+  data.tar.gz: fffe1218aacbb214c899c01f72900756d3c92d13ec64b019e75fdc1307df0712
 SHA512:
-  metadata.gz: a694d48389e3da2154b4d2d6b1ecca186c2e8e8b91d146c4641b06bd7b1f6912c0679979f362a68b63ec9205b570fd71959f916be109036c9721eb36801b1bab
-  data.tar.gz: 324fe4540b931eedb3c913c52b5bb17a02968646d43abf324a5bd34030199632157750e13618046fbd68fd7c64887fcbbac1657b72d00a3e81fc6443defe56e8
+  metadata.gz: 9e6e8069b8151c468aa55e93aacb28bb657ce7b08a5b8ad2fb3a487b016672fb96dcf4c5c32be628d2a2500d890ab498be486c00aad4a94e3a08dac6e918041c
+  data.tar.gz: a63c13ca94c2e74a5fc7ffc0819d2df23a087c8650e817df7d303a695e56140f605a426108982be65fab94b5c3aa6547c578be701cb602c51cb009a9812052cf

data/README.md

@@ -1,7 +1,5 @@
 # SmartProxyDhcpInfoblox
 
-[![Build Status](https://travis-ci.org/theforeman/smart_proxy_dhcp_infoblox.svg?branch=master)](https://travis-ci.org/theforeman/smart_proxy_dhcp_infoblox)
-
 This plugin adds a new DHCP provider for managing records with infoblox servers
 
 ## Installation

data/config/dhcp_infoblox.yml.example

@@ -22,3 +22,12 @@
 # Number of seconds to wait after successful Grid restart (make sure to increase Foreman and CLI timeouts).
 # Set to 0 to disable the delay.
 #:wait_after_restart: 10
+
+# DHCP custom options (name, num, value and vendor_class). Set to blank to ignore.
+# This is only used for 'fixedaddress' record types.
+#:options:
+  #-
+    #name: "DHCP option name"
+    #num: 1234
+    #value: "A value"
+    #vendor_class: "A vendor class"

data/lib/smart_proxy_dhcp_infoblox/common_crud.rb

@@ -17,6 +17,8 @@ module ::Proxy::DHCP::Infoblox
     def all_leases(network_address, subnet)
       address_range_regex = NetworkAddressesRegularExpressionGenerator.new.generate_regex(network_address)
       ::Infoblox::Lease.find(@connection, 'address~' => address_range_regex).map do |lease|
+        # Infoblox can return MAC address set to nil
+        next unless lease.hardware
         Proxy::DHCP::Lease.new(
           lease.client_hostname,
           lease.address,
@@ -27,7 +29,7 @@ module ::Proxy::DHCP::Infoblox
           lease.binding_state,
           :hostname => lease.client_hostname
         )
-      end
+      end.compact
     end
 
     def find_record(subnet_address, an_address)

data/lib/smart_proxy_dhcp_infoblox/dhcp_infoblox_plugin.rb

@@ -6,7 +6,8 @@ module Proxy::DHCP::Infoblox
         :dns_view => "default",
         :network_view => "default",
         :blacklist_duration_minutes => 30 * 60,
-        :wait_after_restart => 10
+        :wait_after_restart => 10,
+        :options => []
 
     validate_presence :username, :password
 

data/lib/smart_proxy_dhcp_infoblox/dhcp_infoblox_version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module DHCP
     module Infoblox
-      VERSION = '0.0.15'.freeze
+      VERSION = '0.0.16'.freeze
     end
   end
 end

data/lib/smart_proxy_dhcp_infoblox/fixed_address_crud.rb

@@ -1,3 +1,4 @@
+require 'yaml'
 require 'smart_proxy_dhcp_infoblox/common_crud'
 
 module ::Proxy::DHCP::Infoblox
@@ -58,6 +59,7 @@ module ::Proxy::DHCP::Infoblox
       host.bootfile = options[:filename]
       host.use_bootfile = true
       host.network_view = network_view
+      host.options = Proxy::DHCP::Infoblox::Plugin.settings.options
       host
     end
   end

data/lib/smart_proxy_dhcp_infoblox/plugin_configuration.rb

@@ -14,7 +14,7 @@ module Proxy::DHCP::Infoblox
       c.dependency :connection, (lambda {
         ::Infoblox.wapi_version = '2.0'
         ::Infoblox::Connection.new(:username => settings[:username], :password => settings[:password],
-                                   :host => settings[:server], :ssl_opts => { :verify => true },
+                                   :host => settings[:server], :ssl_opts => { :verify => !ENV['FOREMAN_INFOBLOX_NOSSLVERIFY'] },
                                    :logger => ::Proxy::LogBuffer::Decorator.instance)
       })
 

data/test/host_and_fixedaddress_crud_test.rb

@@ -208,6 +208,17 @@ class FixedaddressCrudTest < Test::Unit::TestCase
     assert_equal @network_view, built.network_view
   end
 
+  def test_build_host_with_options
+    begin
+      Proxy::DHCP::Infoblox::Plugin.settings.options = [{"name" => "xyz"}]
+
+      host = @crud.build_host(:ip => @ip, :mac => @mac, :hostname => @hostname)
+      assert_equal [{"name" => "xyz"}], host.instance_variable_get("@options")
+    ensure
+      Proxy::DHCP::Infoblox::Plugin.settings.options = []
+    end
+  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"))

data/test/plugin_configuration_test.rb

@@ -16,6 +16,7 @@ class PluginDefaultConfigurationTest < Test::Unit::TestCase
       :blacklist_duration_minutes => 30 * 60,
       :wait_after_restart => 10,
       :dns_view => "default",
+      :options => [],
       :network_view => "default" },
                  Proxy::DHCP::Infoblox::Plugin.default_settings)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dhcp_infoblox
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Klaas Demter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2020-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: infoblox