smart_proxy_dhcp_remote_isc 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 791ed53caa083fc063689c010c4cb947b7848f15
-  data.tar.gz: 7b07573e49911d84b203f37249f34228e085bc29
+  metadata.gz: 021abeb56914c9d2e1fd5e3775067d992ed9ca09
+  data.tar.gz: bcfdd528255e0d59306a3132361bfcae0bdf6d17
 SHA512:
-  metadata.gz: 5a3579fa011f5c5e6fc335e59f5f2eb918c185636d4b446092304f8814833c844c7a5c70cd521f7992edfca46d0c414587d22533b90c32985755d7c3e5edbbf8
-  data.tar.gz: 34e2fffd46cc104689fbe71a9987833f142d408615237da64c9fb1c89221e119d180e3cf0ea3c9ea42bbf4f05d3275645951dac819e2f5c6cfc0e688641e23bf
+  metadata.gz: 3615316ed7c67220e18de8d94f53377e6ee3681987b75061a60e976efd050d8bc600c238033b5aaf39b9ddded25e30b8b18701b6293fac463b307a6fb4ad8a02
+  data.tar.gz: d0693ee71b6c372f928410e93b2c1c63600d7d8a1e9c28981ca9032c82a9214afc56e01c27d27f8325df18cfb82588aee170d200d8183a02ac3ac5201943aecd

data/bundler.d/dhcp_remote_isc.rb

@@ -1,2 +1,4 @@
+group :dhcp_remote_isc do
+  gem 'rsec'
+end
 gem 'smart_proxy_dhcp_remote_isc'
-

data/lib/smart_proxy_dhcp_remote_isc/dhcp_remote_isc_plugin.rb

@@ -2,7 +2,7 @@ module Proxy::DHCP::RemoteISC
   class Plugin < ::Proxy::Provider
     plugin :dhcp_remote_isc, ::Proxy::DHCP::RemoteISC::VERSION
 
-    requires :dhcp, '>= 1.15'
+    requires :dhcp, '>= 1.16'
     default_settings :config => '/etc/dhcp/dhcpd.conf', :leases => '/var/lib/dhcpd/dhcpd.leases',
                      :omapi_port => '7911'
 

data/lib/smart_proxy_dhcp_remote_isc/plugin_configuration.rb

@@ -7,10 +7,9 @@ module Proxy::DHCP::RemoteISC
                                          container.get_dependency(:memory_store), container.get_dependency(:memory_store),
                                          container.get_dependency(:memory_store), container.get_dependency(:memory_store))
       end)
-      container.dependency :parser, lambda {::Proxy::DHCP::RemoteISC::IscFileParser.new}
-      container.dependency :config_file, lambda {::Proxy::DHCP::CommonISC::IscConfigurationFile.new(settings[:config], container.get_dependency(:parser))}
+      container.dependency :parser, lambda {::Proxy::DHCP::CommonISC::ConfigurationParser.new}
       container.dependency :subnet_service_initializer, (lambda do
-        ::Proxy::DHCP::RemoteISC::SubnetServiceInitializer.new(container.get_dependency(:config_file), settings[:leases],
+        ::Proxy::DHCP::RemoteISC::SubnetServiceInitializer.new(settings[:config], settings[:leases],
                                                                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 }
@@ -25,8 +24,8 @@ module Proxy::DHCP::RemoteISC
     def load_classes
       require 'dhcp_common/subnet_service'
       require 'dhcp_common/isc/omapi_provider'
-      require 'dhcp_common/isc/configuration_file'
-      require 'smart_proxy_dhcp_remote_isc/file_parser'
+      require 'dhcp_common/isc/configuration_parser'
+      require 'dhcp_common/isc/subnet_service_initialization'
       require 'smart_proxy_dhcp_remote_isc/subnet_service_initializer'
     end
   end

data/lib/smart_proxy_dhcp_remote_isc/subnet_service_initializer.rb

@@ -1,41 +1,29 @@
 require 'dhcp_common/isc/subnet_service_initialization'
 
 module Proxy::DHCP::RemoteISC
-  class SubnetServiceInitializer
-    include ::Proxy::DHCP::CommonISC::IscSubnetServiceInitialization
+  class SubnetServiceInitializer < ::Proxy::DHCP::CommonISC::IscSubnetServiceInitialization
     include Proxy::Log
 
-    attr_reader :config_file, :leases_path, :parser, :service
+    attr_reader :config_file_path, :leases_file_path
 
-    def initialize(config_file, leases_file_path, isc_config_file_parser, subnet_service)
-      @config_file = config_file
-      @leases_path = leases_file_path
-      @parser = isc_config_file_parser
-      @service = subnet_service
+    def initialize(config_file_path, leases_file_path, parser, subnet_service)
+      @config_file_path = config_file_path
+      @leases_file_path = leases_file_path
+      super(subnet_service, parser)
     end
 
     def initialized_subnet_service
-      load_subnets
-
-      update_subnet_service_with_dhcp_records(hosts_and_leases_from_config(service, config_file))
-      update_subnet_service_with_dhcp_records(hosts_and_leases_from_leases(service, leases_path))
-
-      service
-    end
-
-    def load_subnets
-      service.add_subnets(*config_file.subnets)
+      load_configuration_file(read_config_file, config_file_path)
+      load_leases_file(read_leases_file, leases_file_path)
+      subnet_service
     end
 
-    def hosts_and_leases_from_config(subnet_service, config_file)
-      parser.parse_config_and_leases_for_records(subnet_service, config_file.read)
+    def read_leases_file
+      File.read(File.expand_path(leases_file_path))
     end
 
-    def hosts_and_leases_from_leases(subnet_service, path)
-      fd = File.open(File.expand_path(path), "r")
-      parser.parse_config_and_leases_for_records(subnet_service, fd.read)
-    ensure
-      fd.close unless fd.nil?
+    def read_config_file
+      File.read(File.expand_path(config_file_path))
     end
   end
 end

data/lib/smart_proxy_dhcp_remote_isc/version.rb

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

data/test/plugin_configuration_test.rb

@@ -5,8 +5,9 @@ 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/isc/omapi_provider'
-require 'dhcp_common/isc/configuration_file'
-require 'smart_proxy_dhcp_remote_isc/file_parser'
+require 'rsec'
+require 'dhcp_common/isc/configuration_parser'
+require 'dhcp_common/isc/subnet_service_initialization'
 require 'smart_proxy_dhcp_remote_isc/subnet_service_initializer'
 
 class ConfigurationTest < ::Test::Unit::TestCase
@@ -38,13 +39,6 @@ class ProductionDiWiringsTest < Test::Unit::TestCase
     assert_equal ::Proxy::DHCP::SubnetService, provider.service.class
   end
 
-  def test_config_file_initialization
-    config_file = @container.get_dependency(:config_file)
-
-    assert_equal @settings[:config], config_file.path
-    assert config_file.parser
-  end
-
   def test_parser_initialization
     assert @container.get_dependency(:parser)
   end
@@ -53,10 +47,10 @@ class ProductionDiWiringsTest < Test::Unit::TestCase
     service_initializer = @container.get_dependency(:subnet_service_initializer)
 
     assert service_initializer
-    assert_equal ::Proxy::DHCP::SubnetService, service_initializer.service.class
-    assert_equal ::Proxy::DHCP::RemoteISC::IscFileParser, service_initializer.parser.class
-    assert_equal ::Proxy::DHCP::CommonISC::IscConfigurationFile, service_initializer.config_file.class
-    assert_equal @settings[:leases], service_initializer.leases_path
+    assert_equal ::Proxy::DHCP::SubnetService, service_initializer.subnet_service.class
+    assert_equal ::Proxy::DHCP::CommonISC::ConfigurationParser, service_initializer.parser.class
+    assert_equal @settings[:config], service_initializer.config_file_path
+    assert_equal @settings[:leases], service_initializer.leases_file_path
   end
 
   def test_initialized_subnet_service

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dhcp_remote_isc
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dmitri Dolguikh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
-dependencies: []
+date: 2017-05-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rsec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Smart-Proxy dhcp module provider for NFS-accessible ISC dhcpd installations
 email:
 - dmitri@appliedlogic.ca
@@ -23,7 +37,6 @@ files:
 - config/dhcp_remote_isc.yml.example
 - lib/smart_proxy_dhcp_remote_isc.rb
 - lib/smart_proxy_dhcp_remote_isc/dhcp_remote_isc_plugin.rb
-- lib/smart_proxy_dhcp_remote_isc/file_parser.rb
 - lib/smart_proxy_dhcp_remote_isc/plugin_configuration.rb
 - lib/smart_proxy_dhcp_remote_isc/subnet_service_initializer.rb
 - lib/smart_proxy_dhcp_remote_isc/version.rb
@@ -49,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Smart-Proxy dhcp module provider for NFS-accessible ISC dhcpd installations

data/lib/smart_proxy_dhcp_remote_isc/file_parser.rb

@@ -1,14 +0,0 @@
-require 'dhcp_common/isc/file_parser'
-
-module ::Proxy::DHCP::RemoteISC
-  class IscFileParser < ::Proxy::DHCP::CommonISC::IscFileParser
-    def initialize
-      super(nil)
-    end
-
-    def parse_config_and_leases_for_records(subnet_service, conf)
-      @service = subnet_service
-      super(conf)
-    end
-  end
-end