smart_proxy_dhcp_remote_isc 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 021abeb56914c9d2e1fd5e3775067d992ed9ca09
-  data.tar.gz: bcfdd528255e0d59306a3132361bfcae0bdf6d17
+  metadata.gz: 9573da004f6366a2b3ef71e4215101d63564dc52
+  data.tar.gz: 98c1ca6e725252813d5987eaa6b018c12c5c83ee
 SHA512:
-  metadata.gz: 3615316ed7c67220e18de8d94f53377e6ee3681987b75061a60e976efd050d8bc600c238033b5aaf39b9ddded25e30b8b18701b6293fac463b307a6fb4ad8a02
-  data.tar.gz: d0693ee71b6c372f928410e93b2c1c63600d7d8a1e9c28981ca9032c82a9214afc56e01c27d27f8325df18cfb82588aee170d200d8183a02ac3ac5201943aecd
+  metadata.gz: 1b1caa58f6371c4afcdfb5c95b42618b8becd6490bd8a3419ce6bf4d33453490d986cbd6092238922c7d931bbbb2b8d1fc3e8bfc3224abd2fc44a169c4b09c3c
+  data.tar.gz: 93c09c1bbd822f9e1da50030634dbc895b1286f63c748bad314267639c4f832f65a213f82cadf9242e292684d518e21510d7b7dc8d75c9bc8260046c70f790ff

data/lib/smart_proxy_dhcp_remote_isc/dhcp_remote_isc_plugin.rb

@@ -4,11 +4,13 @@ module Proxy::DHCP::RemoteISC
 
     requires :dhcp, '>= 1.16'
     default_settings :config => '/etc/dhcp/dhcpd.conf', :leases => '/var/lib/dhcpd/dhcpd.leases',
-                     :omapi_port => '7911'
+                     :omapi_port => '7911', :blacklist_duration_minutes => 30*60
 
     validate_readable :config, :leases
 
     load_classes ::Proxy::DHCP::RemoteISC::PluginConfiguration
     load_dependency_injection_wirings ::Proxy::DHCP::RemoteISC::PluginConfiguration
+
+    start_services :free_ips
   end
 end

data/lib/smart_proxy_dhcp_remote_isc/plugin_configuration.rb

@@ -13,16 +13,18 @@ module Proxy::DHCP::RemoteISC
                                                                container.get_dependency(:parser), container.get_dependency(:subnet_service))
       end)
       container.dependency :initialized_subnet_service, lambda {container.get_dependency(:subnet_service_initializer).initialized_subnet_service }
+      container.singleton_dependency :free_ips, lambda {::Proxy::DHCP::FreeIps.new(settings[:blacklist_duration_minutes]) }
 
       container.dependency :dhcp_provider, (lambda do
         Proxy::DHCP::CommonISC::IscOmapiProvider.new(
             settings[:server], settings[:omapi_port], settings[:subnets], settings[:key_name], settings[:key_secret],
-            container.get_dependency(:initialized_subnet_service))
+            container.get_dependency(:initialized_subnet_service), container.get_dependency(:free_ips))
       end)
     end
 
     def load_classes
       require 'dhcp_common/subnet_service'
+      require 'dhcp_common/free_ips'
       require 'dhcp_common/isc/omapi_provider'
       require 'dhcp_common/isc/configuration_parser'
       require 'dhcp_common/isc/subnet_service_initialization'

data/lib/smart_proxy_dhcp_remote_isc/version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module DHCP
     module RemoteISC
-      VERSION = '0.0.3'
+      VERSION = '0.0.4'
     end
   end
 end

data/test/plugin_configuration_test.rb

@@ -4,6 +4,7 @@ require 'tempfile'
 require 'smart_proxy_dhcp_remote_isc/plugin_configuration'
 require 'smart_proxy_dhcp_remote_isc/dhcp_remote_isc_plugin'
 require 'dhcp_common/subnet_service'
+require 'dhcp_common/free_ips'
 require 'dhcp_common/isc/omapi_provider'
 require 'rsec'
 require 'dhcp_common/isc/configuration_parser'
@@ -23,7 +24,7 @@ class ProductionDiWiringsTest < Test::Unit::TestCase
   def setup
     @settings = {:server => "a_server", :omapi_port => 7911, :key_name => "key_name", :key_secret => "key_secret",
                  :subnets => ["192.168.0.0/255.255.255.0"], :config => Tempfile.new('config').path,
-                 :leases => Tempfile.new('leases').path}
+                 :leases => Tempfile.new('leases').path, :blacklist_duration_minutes => 100}
     @container = ::Proxy::DependencyInjection::Container.new
     ::Proxy::DHCP::RemoteISC::PluginConfiguration.new.load_dependency_injection_wirings(@container, @settings)
   end
@@ -37,6 +38,7 @@ class ProductionDiWiringsTest < Test::Unit::TestCase
     assert_equal @settings[:key_secret], provider.key_secret
     assert_equal Set.new(@settings[:subnets]), provider.managed_subnets
     assert_equal ::Proxy::DHCP::SubnetService, provider.service.class
+    assert_equal ::Proxy::DHCP::FreeIps, provider.free_ips.class
   end
 
   def test_parser_initialization
@@ -56,4 +58,11 @@ class ProductionDiWiringsTest < Test::Unit::TestCase
   def test_initialized_subnet_service
     assert @container.get_dependency(:initialized_subnet_service)
   end
+
+  def test_free_ips_configuration
+    free_ips = @container.get_dependency(:free_ips)
+
+    assert free_ips
+    assert_equal @settings[:blacklist_duration_minutes], free_ips.blacklist_interval
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dhcp_remote_isc
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Dmitri Dolguikh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-30 00:00:00.000000000 Z
+date: 2018-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsec
@@ -62,10 +62,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Smart-Proxy dhcp module provider for NFS-accessible ISC dhcpd installations
 test_files:
-- test/test_helper.rb
 - test/plugin_configuration_test.rb
+- test/test_helper.rb