smart_proxy_dhcp_infoblox 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed4af7f2889b7259c13b0ed75d551ae139812fd086e56c40b724bddfaa46cf78
-  data.tar.gz: 7b1716d0ac19d220f26389221fe04793d14a34b4002a1a2c8e531a18e6b0d6a9
+  metadata.gz: c031d153855f68611243ce742482f2c3e0274ad9187dc638cb4f691b3d687448
+  data.tar.gz: 330d031ca651443261dd0df8921577f4c545e2aba97018d42953b71178ed1aae
 SHA512:
-  metadata.gz: 82d8cb3847b9cd9b801a3ce16cee9fb113122fba6e662a10da0f576a7ad6951b6b09d5b1a73a5cb5eedec60f722ecaa7a7089f4e2e2247fbbcbe4b3e525f4352
-  data.tar.gz: e56a98657864b67315907210d27b8c286386ce1dd62bdb78d3a4b0d8595cafb61fc534d7f4083322b530d129aad42b5e8f4cdd5ffc22758bbe3a9838fe14bde6
+  metadata.gz: a694d48389e3da2154b4d2d6b1ecca186c2e8e8b91d146c4641b06bd7b1f6912c0679979f362a68b63ec9205b570fd71959f916be109036c9721eb36801b1bab
+  data.tar.gz: 324fe4540b931eedb3c913c52b5bb17a02968646d43abf324a5bd34030199632157750e13618046fbd68fd7c64887fcbbac1657b72d00a3e81fc6443defe56e8

data/config/dhcp_infoblox.yml.example

@@ -1,15 +1,24 @@
 ---
-#
 # Configuration file for 'dhcp_infoblox' dhcp provider
 #
-# use :server setting in dhcp.yml if you are managing a dhcp server which is not localhost
-# use :subnets setting in dhcp.yml if you want to restrict subnets available to smart-proxy
-#
-:username: "infoblox"
+# Use :server setting in dhcp.yml if you are managing a dhcp server which is not localhost.
+# Use :subnets setting in dhcp.yml if you want to restrict subnets available to smart-proxy.
+
+# Credentials for Infoblox API, make sure the DHCP Role is assigned
+:username: "admin"
 :password: "infoblox"
-#
-# Record type to manage: can be "host" or "fixedaddress"
-#
-:record_type: 'host'
-#:dns_view: 'non-default'
-#:network_view: 'another-non-default'
+
+# Record type to manage: can be "host" or "fixedaddress". The latter is recommended as
+# "host" setting will cause conflicts when using Infoblox DNS smart proxy plugin. When
+# using "host" setting make sure domain exists in Infoblox.
+:record_type: 'fixedaddress'
+
+# View used for fixedaddress record type.
+#:network_view: 'default'
+
+# View used for host record type, usually 'default.myview' for custom names.
+#:dns_view: 'default'
+
+# 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

data/lib/smart_proxy_dhcp_infoblox/common_crud.rb

@@ -1,5 +1,6 @@
 require 'resolv'
 require 'smart_proxy_dhcp_infoblox/ip_address_arithmetic'
+require 'smart_proxy_dhcp_infoblox/network_address_range_regex_generator'
 require "proxy/validations"
 
 module ::Proxy::DHCP::Infoblox
@@ -13,8 +14,20 @@ module ::Proxy::DHCP::Infoblox
       @connection = connection
     end
 
-    def all_leases(network_address)
-      [] # infoblox doesn't support leases
+    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|
+        Proxy::DHCP::Lease.new(
+          lease.client_hostname,
+          lease.address,
+          lease.hardware,
+          subnet,
+          lease.starts,
+          lease.ends,
+          lease.binding_state,
+          :hostname => lease.client_hostname
+        )
+      end
     end
 
     def find_record(subnet_address, an_address)

data/lib/smart_proxy_dhcp_infoblox/dhcp_infoblox_main.rb

@@ -32,7 +32,7 @@ module Proxy::DHCP::Infoblox
     end
 
     def all_leases(network_address)
-      crud.all_leases(full_network_address(network_address))
+      crud.all_leases(full_network_address(network_address), find_subnet(network_address))
     end
 
     def find_record(subnet_address, an_address)
@@ -92,7 +92,7 @@ module Proxy::DHCP::Infoblox
     def find_network(network_address)
       network = ::Infoblox::Network.find(connection, 'network' => network_address, 'network_view' => network_view,
                                          '_max_results' => 1).first
-      raise "Subnet #{network_address} not found" if network.nil?
+      raise "Subnet #{network_address} not found in network view #{network_view}" if network.nil?
       network
     end
 

data/lib/smart_proxy_dhcp_infoblox/dhcp_infoblox_plugin.rb

@@ -2,7 +2,12 @@ module Proxy::DHCP::Infoblox
   class Plugin < ::Proxy::Provider
     plugin :dhcp_infoblox, ::Proxy::DHCP::Infoblox::VERSION
 
-    default_settings :record_type => 'host', :dns_view => "default", :network_view => "default", :blacklist_duration_minutes => 30 * 60
+    default_settings :record_type => 'fixedaddress',
+        :dns_view => "default",
+        :network_view => "default",
+        :blacklist_duration_minutes => 30 * 60,
+        :wait_after_restart => 10
+
     validate_presence :username, :password
 
     requires :dhcp, '>= 1.13'

data/lib/smart_proxy_dhcp_infoblox/dhcp_infoblox_version.rb

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

data/lib/smart_proxy_dhcp_infoblox/grid_restart.rb

@@ -1,6 +1,6 @@
 module ::Proxy::DHCP::Infoblox
   class GridRestart
-    MAX_ATTEMPTS = 3
+    MAX_ATTEMPTS = 5
 
     include ::Proxy::Log
     attr_reader :connection
@@ -10,21 +10,32 @@ module ::Proxy::DHCP::Infoblox
     end
 
     def try_restart
-      logger.debug 'Restarting grid.'
+      logger.info 'Restarting Infoblox Grid'
 
+      delay = Proxy::DHCP::Infoblox::Plugin.settings.wait_after_restart.to_i
       MAX_ATTEMPTS.times do |tries|
+        if restart
+          if delay > 0
+            logger.info "Starting post-restart delay of #{delay} seconds..."
+            sleep delay
+            logger.debug "Post-restart delay done"
+          end
+          return
+        end
         sleep tries
-        return if restart
       end
 
-      logger.info 'Restarting Grid failed.'
+      logger.warn 'Restarting Infoblox Grid failed, giving up'
       false
     end
 
+    private
+
     def restart
       (@grid ||= ::Infoblox::Grid.get(@connection).first).restartservices
       true
     rescue Exception => e
+      logger.warn "Error during Grid restart: #{e}"
       false
     end
   end

data/test/infoblox_provider_test.rb

@@ -16,9 +16,49 @@ class InfobloxProviderTest < Test::Unit::TestCase
     @network = Infoblox::Network.new(:network => '192.168.42.0/24')
     @subnet = ::Proxy::DHCP::Subnet.new('192.168.42.0', '255.255.255.0')
 
-    @network_2 = Infoblox::Network.new(:network => '192.168.43.0/24')
+    @network_2 = Infoblox::Network.new(:network => '192.168.32.0/19')
+    @subnet_2 = ::Proxy::DHCP::Subnet.new('192.168.32.0', '255.255.224.0')
+
+    @network_3 = Infoblox::Network.new(:network => '192.168.43.0/24')
+
+    @provider = Proxy::DHCP::Infoblox::Provider.new(@connection, @crud, @restart_grid,
+                                                    @unused_ips, @managed_subnets, @network_view)
+
+    @lease = Infoblox::Lease.new(:address => '192.168.43.127',
+                                 :binding_state => 'active',
+                                 :client_hostname => 'example',
+                                 :hardware => 'ba:be:fa:ce:ca:fe',
+                                 :network => @subnet.network,
+                                 :starts => nil,
+                                 :ends => nil)
+
+    @lease_2 = Infoblox::Lease.new(:address => '192.168.60.121',
+                                   :binding_state => 'active',
+                                   :client_hostname => 'example',
+                                   :hardware => 'c0:fe:fe:f0:01:bb',
+                                   :network => @subnet_2.network,
+                                   :starts => nil,
+                                   :ends => nil)
+  end
+
+  def test_leases
+    @crud = ::Proxy::DHCP::Infoblox::CommonCRUD.new(@connection)
     @provider = Proxy::DHCP::Infoblox::Provider.new(@connection, @crud, @restart_grid,
                                                     @unused_ips, @managed_subnets, @network_view)
+
+    @provider.expects(:full_network_address).with(@subnet.network).returns(@network.network)
+    Infoblox::Lease.expects(:find).with(@connection, 'address~' => "192\\.168\\.42\\..+").returns([@lease])
+    assert_equal @lease.hardware, @provider.all_leases(@subnet.network).first.mac
+  end
+
+  def test_nonclass_leases
+    @crud = ::Proxy::DHCP::Infoblox::CommonCRUD.new(@connection)
+    @provider = Proxy::DHCP::Infoblox::Provider.new(@connection, @crud, @restart_grid,
+                                                    @unused_ips, @managed_subnets, @network_view)
+
+    @provider.expects(:full_network_address).with(@subnet_2.network).returns(@network_2.network)
+    Infoblox::Lease.expects(:find).with(@connection, 'address~' => "192\\.168\\.(0?3[3456789]|0?[45][0123456789]|0?6[012])\\..+").returns([@lease_2])
+    assert_equal @lease_2.hardware, @provider.all_leases(@subnet_2.network).first.mac
   end
 
   def test_subnets
@@ -29,7 +69,7 @@ class InfobloxProviderTest < Test::Unit::TestCase
   def test_subnets_returns_managed_subnets_only
     provider = Proxy::DHCP::Infoblox::Provider.new(@connection, @crud, @restart_grid,
                                                    @unused_ips, ['192.168.42.0/255.255.255.0'], @network_view)
-    Infoblox::Network.expects(:all).with(@connection).returns([@network, @network_2])
+    Infoblox::Network.expects(:all).with(@connection).returns([@network, @network_3])
     assert_equal [@subnet], provider.subnets
   end
 

data/test/plugin_configuration_test.rb

@@ -12,7 +12,11 @@ require 'smart_proxy_dhcp_infoblox/dhcp_infoblox_main'
 
 class PluginDefaultConfigurationTest < Test::Unit::TestCase
   def test_default_settings
-    assert_equal({ :record_type => 'host', :blacklist_duration_minutes => 30 * 60, :dns_view => "default", :network_view => "default" },
+    assert_equal({ :record_type => 'fixedaddress',
+      :blacklist_duration_minutes => 30 * 60,
+      :wait_after_restart => 10,
+      :dns_view => "default",
+      :network_view => "default" },
                  Proxy::DHCP::Infoblox::Plugin.default_settings)
   end
 end
@@ -21,8 +25,8 @@ class InfobloxDhcpProductionWiringTest < Test::Unit::TestCase
   def setup
     @network_view = "network_view"
     @dns_view = "dns_view"
-    @settings = { :username => 'user', :password => 'password', :server => '127.0.0.1', :record_type => 'host',
-                 :subnets => ['1.1.1.0/255.255.255.0'], :blacklist_duration_minutes => 300,
+    @settings = { :username => 'user', :password => 'password', :server => '127.0.0.1', :record_type => 'fixedaddress',
+                 :subnets => ['1.1.1.0/255.255.255.0'], :blacklist_duration_minutes => 300, :wait_after_restart => 1,
                  :dns_view => @dns_view, :network_view => @network_view }
     @container = ::Proxy::DependencyInjection::Container.new
     Proxy::DHCP::Infoblox::PluginConfiguration.new.load_dependency_injection_wirings(@container, @settings)
@@ -66,7 +70,7 @@ class InfobloxDhcpProductionWiringTest < Test::Unit::TestCase
     assert_not_nil provider.free_ips
     assert_equal @network_view, provider.network_view
     assert provider.managed_subnets.include?('1.1.1.0/255.255.255.0')
-    assert provider.crud.instance_of?(::Proxy::DHCP::Infoblox::HostIpv4AddressCRUD)
+    assert provider.crud.instance_of?(::Proxy::DHCP::Infoblox::FixedAddressCRUD)
   end
 
   def test_provider_configuration_with_fixedaddress_crud

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dhcp_infoblox
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Klaas Demter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: infoblox
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -94,17 +88,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Infoblox DHCP provider plugin for Foreman's smart proxy
 test_files:
-- test/record_type_validator_test.rb
-- test/regex_generator_test.rb
 - test/test_helper.rb
+- test/infoblox_provider_test.rb
+- test/plugin_configuration_test.rb
+- test/record_type_validator_test.rb
 - test/unused_ip_test.rb
 - test/host_and_fixedaddress_crud_test.rb
+- test/regex_generator_test.rb
 - test/integration_test.rb
-- test/plugin_configuration_test.rb
-- test/infoblox_provider_test.rb