smart_proxy_dhcp_dnsmasq 0.7 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9f60a51d51d8a80edf7ebd7f841ef4f5e44397c4b86bfb5c13c8872fab3d74b
-  data.tar.gz: e528fe5bc8aef7b939ab6feea332ec2c0aedba81d5a101e2be1d063c242fb2b4
+  metadata.gz: 91ee0c71835884e0210ee0ec7b153e129786423536ca71bc67696019828e09df
+  data.tar.gz: 0b919d07a4f75212c0fea23a8852d2585930d6e7f693ff8e854dd11badce18eb
 SHA512:
-  metadata.gz: 45ba84592849d76efe6725ec24723509ac3347d7a4ff15c1de47969aeb3cd5a9e019d51521b2bdddca27ff7bb25c861fd49ff6c17261a08cc1be60066099cd0c
-  data.tar.gz: 9d7e177853adff920b1c98892c4a240c174afdb7ff07e848ec49065434f2f59ca9e7df890cc4a2fdcfdb7e0b426dfa09417a960986f12a8b8b66e40400a94c62
+  metadata.gz: 89feab88442bbc7c0b2c53f8a98879b036d8c903bff62e838a3318f1efe69339c61f891e301a2fd6a03d046f813aa969ea2549b83bb0fd6b2f950d76ffde98d2
+  data.tar.gz: a87a85b1252ac9063677967ec79d6df39c1e6c62865bfa3e25781011c4d13471694aa9166a81e9f209c2fbc2b59a8c66a3ff499e6afa7c499fde0d709a12cddb

data/README.md

@@ -8,7 +8,7 @@ This plugin adds a new DHCP provider for managing records in dnsmasq.
 See [How_to_Install_a_Smart-Proxy_Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Smart-Proxy_Plugin)
 for how to install Smart Proxy plugins
 
-This plugin is compatible with Smart Proxy 1.15 or higher.
+This plugin is compatible with Smart Proxy 1.17 or higher.
 
 You need to add two lines to your dnsmasq configuration to use this plugin;
 ```

data/bundler.d/dhcp_dnsmasq.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 gem 'smart_proxy_dhcp_dnsmasq'

data/lib/smart_proxy_dhcp_dnsmasq.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Proxy
   module DHCP
     module Dnsmasq; end

data/lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_main.rb

@@ -1,23 +1,25 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'tempfile'
 require 'dhcp_common/server'
 
 module Proxy::DHCP::Dnsmasq
-  class Record < ::Proxy::DHCP::Server
+  class Provider < ::Proxy::DHCP::Server
     attr_reader :config_dir, :reload_cmd, :subnet_service
 
-    def initialize(target_dir, reload_cmd, subnet_service)
+    def initialize(target_dir, reload_cmd, subnet_service, free_ips)
       @config_dir = target_dir
       @reload_cmd = reload_cmd
       @subnet_service = subnet_service
       @optsfile_content = []
 
       Dir.mkdir @config_dir unless Dir.exist? @config_dir
-      cleanup_optsfile if true # TODO: Only cleanup occasionally
+      cleanup_optsfile if subnet_service.cleanup_time?
 
       subnet_service.load!
 
-      super('localhost', nil, subnet_service)
+      super('localhost', nil, subnet_service, free_ips)
     end
 
     def add_record(options = {})
@@ -64,22 +66,32 @@ module Proxy::DHCP::Dnsmasq
 
     private
 
+    def optsfile_path
+      @optsfile_path ||= File.join(@config_dir, 'dhcpopts.conf').freeze
+    end
+
     def try_reload_cmd
       logger.debug 'Reloading DHCP configuration...'
-      raise Proxy::DHCP::Error, 'Failed to reload configuration' \
-        unless system(@reload_cmd)
+      raise Proxy::DHCP::Error, 'Failed to reload configuration' unless system(@reload_cmd)
     end
 
     def optsfile_content
-      path = File.join(@config_dir, 'dhcpopts.conf').freeze
+      path = optsfile_path
+
+      return @optsfile_content unless @optsfile_content.empty?
+      return (@optsfile_content ||= []) unless File.exist?(path)
 
-      @optsfile_content = File.open(path).readlines.map(&:chomp).reject(&:empty?) \
-        if File.exist?(path) && @optsfile_content.empty?
-      @optsfile_content
+      @optsfile_content = File.open(path) do |file|
+        file.readlines
+            .map(&:chomp)
+            .reject(&:empty?)
+            .sort
+            .uniq.compact
+      end
     end
 
     def append_optsfile(line)
-      path = File.join(@config_dir, 'dhcpopts.conf').freeze
+      path = optsfile_path
       logger.debug "Appending #{line} to dhcpopts.conf"
 
       optsfile_content << line
@@ -87,9 +99,11 @@ module Proxy::DHCP::Dnsmasq
     end
 
     def cleanup_optsfile
+      subnet_service.last_cleanup = Time.now
+
       used_tags = []
       Dir.glob(File.join(@config_dir, 'dhcphosts', '*.conf')) do |file|
-        File.read(file).scan(/set:(.*?),/m) { |tag| used_tags << tag }
+        File.read(file).scan(/set:(.*?),/m) { |tag| used_tags += tag }
       end
       used_tags = used_tags.sort.uniq
 
@@ -97,7 +111,8 @@ module Proxy::DHCP::Dnsmasq
         tag = line[/tag:(.*?),/, 1]
         used_tags.include?(tag)
       end
-      File.write(File.join(@config_dir, 'dhcpopts.conf'), optsfile_content.join("\n") + "\n")
+
+      File.write(optsfile_path, optsfile_content.join("\n") + "\n")
     end
 
     def sanitize_string(string)

data/lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_plugin.rb

@@ -1,19 +1,23 @@
-require 'smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_configuration'
+# frozen_string_literal: true
+
 require 'smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_version'
+require 'smart_proxy_dhcp_dnsmasq/plugin_configuration'
 
 module Proxy::DHCP::Dnsmasq
   class Plugin < ::Proxy::Provider
     plugin :dhcp_dnsmasq, ::Proxy::DHCP::Dnsmasq::VERSION
 
-    requires :dhcp, '>= 1.15'
-    default_settings :config=> '/etc/dnsmasq.conf',
-                     :target_dir => '/var/lib/foreman-proxy/dhcp/',
-                     :lease_file => '/var/lib/dnsmasq/dhcp.leases',
-                     :reload_cmd => 'systemctl reload dnsmasq'
+    requires :dhcp, '>= 1.17'
+    default_settings config: '/etc/dnsmasq.conf',
+                     target_dir: '/var/lib/foreman-proxy/dhcp/',
+                     lease_file: '/var/lib/dnsmasq/dhcp.leases',
+                     reload_cmd: 'systemctl reload dnsmasq'
 
     validate_readable :lease_file
 
     load_classes ::Proxy::DHCP::Dnsmasq::PluginConfiguration
     load_dependency_injection_wirings ::Proxy::DHCP::Dnsmasq::PluginConfiguration
+
+    start_services :unused_ips, :subnet_service
   end
 end

data/lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_subnet_service.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require 'ipaddr'
-#require 'rb-inotify'
+require 'pathname'
+require 'rb-inotify'
 require 'dhcp_common/dhcp_common'
 require 'dhcp_common/subnet_service'
 
@@ -7,6 +10,9 @@ module Proxy::DHCP::Dnsmasq
   class SubnetService < ::Proxy::DHCP::SubnetService
     include Proxy::Log
 
+    OPTSFILE_CLEANUP_INTERVAL = 15 * 60 # 15 minutes
+
+    attr_accessor :last_cleanup
     attr_reader :config_dir, :lease_file
 
     def initialize(config, target_dir, lease_file, leases_by_ip, leases_by_mac, reservations_by_ip, reservations_by_mac, reservations_by_name)
@@ -14,46 +20,79 @@ module Proxy::DHCP::Dnsmasq
       @target_dir = target_dir
       @lease_file = lease_file
 
+      # Must be an absolute path for the inotify watch to succeed at the moment
+      @lease_file = File.expand_path(@lease_file) unless (Pathname.new @lease_file).absolute?
+
       super(leases_by_ip, leases_by_mac, reservations_by_ip, reservations_by_mac, reservations_by_name)
     end
 
     def load!
+      # TODO: Refresh data if outdated
+      return true if subnets.any?
+
       add_subnet(parse_config_for_subnet)
       load_subnet_data
-      #add_watch # TODO
 
       true
     end
 
-    def add_watch
-      # TODO: Add proper inotify listener for configs
+    def watch_leases
+      logger.info "Watching leases in file #{lease_file}"
       @inotify = INotify::Notifier.new
       @inotify.watch(File.dirname(lease_file), :modify, :moved_to) do |ev|
         next unless ev.absolute_name == lease_file
 
         leases = load_leases
 
-        # FIXME: Proper method for this
         m.synchronize do
           leases_by_ip.clear
           leases_by_mac.clear
+
+          leases.each do |record|
+            subnet_address = record.subnet_address
+
+            leases_by_ip[subnet_address, record.ip] = record
+            leases_by_mac[subnet_address, record.mac] = record
+          end
         end
-        leases.each { |l| add_lease(l.subnet_address, l) }
       end
+
+      @inotify.run
+    rescue INotify::QueueOverflowError => e
+      logger.warn "Queue overflow occured when monitoring #{lease_file}, restarting monitoring", e
+      sleep 60
+      retry
+    rescue StandardError => e
+      logger.error "Error occured when monitoring #{lease_file}", e
+    end
+
+    def start
+      Thread.new { watch_leases }
+    end
+
+    def stop
+      @inotify&.stop
+    end
+
+    def cleanup_time?
+      Time.now - (@last_cleanup ||= Time.now) > OPTSFILE_CLEANUP_INTERVAL
     end
 
     def parse_config_for_subnet
       configuration = { options: {} }
       files = []
       @config_paths.each do |path|
-        files << path if File.exist? path
-        files += Dir["#{path}/*"] if Dir.exist? path
+        if File.directory? path
+          files += Dir[File.join(path, '*')]
+        else
+          files << path
+        end
       end
 
       logger.debug "Starting parse of DHCP subnets from #{files}"
       files.each do |file|
         logger.debug "  Parsing #{file}..."
-        open(file, 'r').each_line do |line|
+        File.open(file, 'r').each_line do |line|
           line.strip!
           next if line.empty? || line.start_with?('#') || !line.include?('=')
 
@@ -83,12 +122,13 @@ module Proxy::DHCP::Dnsmasq
             configuration.merge! \
               address: IPAddr.new("#{range_from}/#{mask}").to_s,
               mask: mask,
-              range: [range_from, range_to],
               ttl: ttl
+
+            configuration[:options][:range] = [range_from, range_to]
           when 'dhcp-option'
             data = value.split(',')
 
-            data.shift until data.empty? || /\A\d+\z/ === data.first
+            data.shift until data.empty? || /\A\d+\z/ =~ data.first
             next if data.empty?
 
             code = data.shift.to_i
@@ -110,15 +150,19 @@ module Proxy::DHCP::Dnsmasq
     def parse_config_for_dhcp_reservations
       to_ret = {}
       files = []
+
       @config_paths.each do |path|
-        files << path if File.exist? path
-        files += Dir[File.join(path), '*'] if Dir.exist? path
+        if File.directory? path
+          files += Dir[File.join(path, '*')]
+        else
+          files << path
+        end
       end
 
       logger.debug "Starting parse of DHCP reservations from #{files}"
       files.each do |file|
         logger.debug "  Parsing #{file}..."
-        open(file, 'r').each_line do |line|
+        File.open(file, 'r').each_line do |line|
           line.strip!
           next if line.empty? || line.start_with?('#') || !line.include?('=')
 
@@ -137,7 +181,7 @@ module Proxy::DHCP::Dnsmasq
               hostname,
               ip,
               mac,
-              subnet,
+              subnet
               # :source_file => file # TODO: Needs to overload the comparison
             )
           when 'dhcp-boot'
@@ -150,8 +194,8 @@ module Proxy::DHCP::Dnsmasq
 
               file, server = data
 
-              to_ret[mac].options[:nextServer] = file
-              to_ret[mac].options[:filename] = server
+              to_ret[mac].options[:nextServer] = server
+              to_ret[mac].options[:filename] = file
             end
           end
         end
@@ -161,7 +205,7 @@ module Proxy::DHCP::Dnsmasq
       dhcpopts_path = File.join(@target_dir, 'dhcpopts.conf')
       logger.debug "Parsing DHCP options from #{dhcpopts_path}"
       if File.exist? dhcpopts_path
-        open(dhcpopts_path, 'r').each_line do |line|
+        File.open(dhcpopts_path, 'r').each_line do |line|
           data = line.strip.split(',')
           next if data.empty? || !data.first.start_with?('tag:')
 
@@ -175,14 +219,14 @@ module Proxy::DHCP::Dnsmasq
       logger.debug "Parsing provisioned DHCP reservations from #{@target_dir}"
       Dir[File.join(@target_dir, 'dhcphosts', '*')].each do |file|
         logger.debug "  Parsing #{file}..."
-        open(file, 'r').each_line do |line|
+        File.open(file, 'r').each_line do |line|
           data = line.strip.split(',')
           next if data.empty? || data.first.start_with?('#')
 
           mac = data.first
           data.shift
 
-          options = { :deletable => true }
+          options = { deletable: true }
           while data.first.start_with? 'set:'
             tag = data.first[4..-1]
             data.shift
@@ -212,7 +256,7 @@ module Proxy::DHCP::Dnsmasq
     def load_subnet_data
       reservations = parse_config_for_dhcp_reservations
       reservations.each do |record|
-        if dupe = find_host_by_mac(record.subnet_address, record.mac)
+        if (dupe = find_host_by_mac(record.subnet_address, record.mac))
           logger.debug "Found duplicate #{dupe} when adding record #{record}, skipping"
           next
         end
@@ -223,11 +267,11 @@ module Proxy::DHCP::Dnsmasq
 
       leases = load_leases
       leases.each do |lease|
-        if dupe = find_lease_by_mac(lease.subnet_address, lease.mac)
+        if (dupe = find_lease_by_mac(lease.subnet_address, lease.mac))
           logger.debug "Found duplicate #{dupe} by MAC when adding lease #{lease}, skipping"
           next
         end
-        if dupe = find_lease_by_ip(lease.subnet_address, lease.ip)
+        if (dupe = find_lease_by_ip(lease.subnet_address, lease.ip))
           logger.debug "Found duplicate #{dupe} by IP when adding lease #{lease}, skipping"
           next
         end
@@ -239,7 +283,9 @@ module Proxy::DHCP::Dnsmasq
 
     # Expects subnet_service to have subnet data
     def load_leases
-      open(@lease_file, 'r').readlines.map do |line|
+      raise 'No subnets configured' unless subnets.any?
+
+      File.open(@lease_file, 'r').readlines.map do |line|
         timestamp, mac, ip, _hostname, _client_id = line.split
         timestamp = timestamp.to_i
 
@@ -250,7 +296,10 @@ module Proxy::DHCP::Dnsmasq
           timestamp,
           'active'
         )
-      end
+      end.compact
+    rescue StandardError => e
+      logger.error 'Unable to load leases', e
+      []
     end
   end
 end

data/lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_version.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Proxy
   module DHCP
     module Dnsmasq
-      VERSION = '0.7'.freeze
+      VERSION = '1.0'
     end
   end
 end

data/lib/smart_proxy_dhcp_dnsmasq/{dhcp_dnsmasq_configuration.rb → plugin_configuration.rb}

@@ -1,14 +1,19 @@
+# frozen_string_literal: true
+
 module ::Proxy::DHCP::Dnsmasq
   class PluginConfiguration
     def load_classes
+      require 'dhcp_common/free_ips'
       require 'smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_subnet_service'
       require 'smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_main'
     end
 
     def load_dependency_injection_wirings(container, settings)
+      container.singleton_dependency :unused_ips, -> { ::Proxy::DHCP::FreeIps.new(settings[:blacklist_duration_minutes]) }
+
       container.dependency :memory_store, ::Proxy::MemoryStore
 
-      container.dependency :subnet_service, (lambda do
+      container.singleton_dependency :subnet_service, (lambda do
         ::Proxy::DHCP::Dnsmasq::SubnetService.new(
           settings[:config], settings[:target_dir], settings[:lease_file],
           container.get_dependency(:memory_store),
@@ -17,9 +22,10 @@ module ::Proxy::DHCP::Dnsmasq
         )
       end)
       container.dependency :dhcp_provider, (lambda do
-        Proxy::DHCP::Dnsmasq::Record.new(
+        Proxy::DHCP::Dnsmasq::Provider.new(
           settings[:target_dir],
-          settings[:reload_cmd], container.get_dependency(:subnet_service)
+          settings[:reload_cmd], container.get_dependency(:subnet_service),
+          container.get_dependency(:unused_ips)
         )
       end)
     end

data/test/dhcp_dnsmasq_default_settings_test.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'test_helper'
-require 'smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_configuration'
 require 'smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_plugin'
+require 'smart_proxy_dhcp_dnsmasq/plugin_configuration'
 
 class DnsDnsmasqDefaultSettingsTest < Test::Unit::TestCase
   def test_default_settings

data/test/dhcp_dnsmasq_production_wiring_test.rb

@@ -1,12 +1,16 @@
+# frozen_string_literal: true
+
 require 'test_helper'
-require 'smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_configuration'
+require 'dhcp_common/dhcp_common'
+require 'dhcp_common/free_ips'
 require 'smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_main'
+require 'smart_proxy_dhcp_dnsmasq/plugin_configuration'
 
 class DHCPDnsmasqProductionWiringTest < Test::Unit::TestCase
   def setup
     @container = ::Proxy::DependencyInjection::Container.new
     @config = ::Proxy::DHCP::Dnsmasq::PluginConfiguration.new
-    Proxy::DHCP::Dnsmasq::Record.any_instance.stubs(:cleanup_optsfile)
+    Proxy::DHCP::Dnsmasq::Provider.any_instance.stubs(:cleanup_optsfile)
   end
 
   def test_dns_provider_initialization_default
@@ -15,10 +19,10 @@ class DHCPDnsmasqProductionWiringTest < Test::Unit::TestCase
 
     @config.load_dependency_injection_wirings(
       @container,
-      :config => '/etc/dnsmasq.conf',
-      :target_dir => '/etc/dnsmasq.d/dhcp',
-      :lease_file => '/tmp/dhcp.leases',
-      :reload_cmd => 'systemctl reload dnsmasq'
+      config: '/etc/dnsmasq.conf',
+      target_dir: '/etc/dnsmasq.d/dhcp',
+      lease_file: '/tmp/dhcp.leases',
+      reload_cmd: 'systemctl reload dnsmasq'
     )
 
     provider = @container.get_dependency(:dhcp_provider)

data/test/dhcp_dnsmasq_record_handling_test.rb

@@ -1,18 +1,25 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_main'
 
 class DHCPDnsmasqRecordHandlingTest < Test::Unit::TestCase
   def setup
+    @free_ips = mock
     @subnet_service = mock
     @subnet_service.expects(:load!).returns(true)
+    @subnet_service.expects(:cleanup_time?).returns(false)
+    @subnet_service.stubs(:last_cleanup=)
     Dir.stubs(:exist?).returns(true)
-    Proxy::DHCP::Dnsmasq::Record.any_instance.stubs(:cleanup_optsfile)
+    Proxy::LogBuffer::Decorator.any_instance.stubs(:add)
 
-    @server = ::Proxy::DHCP::Dnsmasq::Record.new('/etc/dnsmasq.d/', '/bin/true', @subnet_service)
-    @server.instance_eval('@optsfile_content = []')
+    @server = ::Proxy::DHCP::Dnsmasq::Provider.new('/etc/dnsmasq.d/', '/bin/true', @subnet_service, @free_ips)
+    @server.instance_eval('@optsfile_content = []', __FILE__, __LINE__)
   end
 
   def test_add_record
+    Proxy::DHCP::Dnsmasq::Provider.any_instance.expects(:cleanup_optsfile).never
+
     subnet = ::Proxy::DHCP::Subnet.new('10.0.0.0', '255.0.0.0')
     @subnet_service.stubs(:find_subnet).with('10.0.0.0').returns(subnet)
     @subnet_service.stubs(:find_hosts_by_ip).returns(nil)
@@ -52,4 +59,46 @@ class DHCPDnsmasqRecordHandlingTest < Test::Unit::TestCase
 
     @server.del_record(host)
   end
+
+  def test_optsfile_reading
+    @server.stubs(:optsfile_path).returns 'test/fixtures/dhcpopts.conf'
+
+    assert_equal %w[
+      tag:bf_pxelinux_0,option:bootfile-name,pxelinux.0
+      tag:bf_pxelinux_1,option:bootfile-name,pxelinux.1
+      tag:bf_pxelinux_2,option:bootfile-name,pxelinux.2
+      tag:bf_pxelinux_3,option:bootfile-name,pxelinux.3
+      tag:bf_pxelinux_4,option:bootfile-name,pxelinux.4
+      tag:ns_tftp_server,option:tftp-server,tftp.server
+      tag:ns_tftp_server_local,option:tftp-server,tftp.server.local
+    ], @server.send(:optsfile_content)
+  end
+
+  def test_optsfile_append
+    @server.stubs(:optsfile_path).returns '/dev/null'
+    @server.instance_variable_set :@optsfile_content, %w[tag:bf_pxelinux_0,option:bootfile-name,pxelinux.0]
+
+    File.expects(:write).with('/dev/null', "tag:bf_pxelinux_0,option:bootfile-name,pxelinux.0\ntag:ns_tftp_server_local,option:tftp-server.local\n")
+
+    @server.send :append_optsfile, 'tag:ns_tftp_server_local,option:tftp-server.local'
+  end
+
+  def test_optsfile_cleanup
+    @server.stubs(:optsfile_path).returns '/dev/null'
+    @server.instance_variable_set :@optsfile_content, %w[tag:bf_pxelinux_0,option:bootfile-name,pxelinux.0]
+
+    Dir.expects(:glob).returns([])
+    File.expects(:write).with('/dev/null', "\n")
+
+    @server.send :cleanup_optsfile
+  end
+
+  def test_optsfile_cleanup_real
+    @server.stubs(:optsfile_path).returns 'test/fixtures/dhcpopts.conf'
+    @server.instance_variable_set :@config_dir, 'test/fixtures'
+
+    File.expects(:write).with('test/fixtures/dhcpopts.conf', "tag:bf_pxelinux_0,option:bootfile-name,pxelinux.0\ntag:ns_tftp_server_local,option:tftp-server,tftp.server.local\n")
+
+    @server.send :cleanup_optsfile
+  end
 end

data/test/dhcp_dnsmasq_subnet_service_test.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 require 'smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_subnet_service'
 
 class DHCPDnsmasqSubnetServiceTest < Test::Unit::TestCase
   def setup
-    @subnet_service = mock()
+    @subnet_service = mock
     Dir.stubs(:exist?).returns(true)
   end
 
@@ -26,8 +28,45 @@ class DHCPDnsmasqSubnetServiceTest < Test::Unit::TestCase
     initializer.expects(:parse_config_for_subnet).returns(subnet)
     initializer.expects(:parse_config_for_dhcp_reservations).returns([host])
     initializer.expects(:load_leases).returns([lease])
-#    initializer.expects(:add_watch)
+    # initializer.expects(:add_watch)
 
     initializer.load!
   end
+
+  def test_load_fixtures
+    service = Proxy::DHCP::Dnsmasq::SubnetService.new(
+      'test/fixtures/config/dnsmasq.conf', 'test/fixtures/config/dhcp', 'test/fixtures/config/dhcp.leases',
+      ::Proxy::MemoryStore.new, ::Proxy::MemoryStore.new,
+      ::Proxy::MemoryStore.new, ::Proxy::MemoryStore.new,
+      ::Proxy::MemoryStore.new
+    )
+
+    assert service.load!
+
+    subnet = service.subnets.first.last
+    assert_not_nil subnet
+    assert_equal '192.168.0.0', subnet.network
+    assert_equal '255.255.255.0', subnet.netmask
+    assert_equal IPAddr.new('192.168.0.0/24'), subnet.ipaddr
+    assert_equal ['192.168.0.200', '192.168.0.223'], subnet.options[:range]
+    assert_equal ['192.168.0.1'], subnet.options[:domain_name_servers]
+    assert_equal '192.168.0.1-192.168.0.254', subnet.range
+
+    # 3 in dnsmasq.conf
+    # 1 in dhcphosts/
+    assert_equal 4, service.reservations_by_name.values.count
+
+    reservation = service.find_host_by_hostname('host1')
+    assert_not_nil reservation
+    assert_equal '00:11:22:33:44:55', reservation.mac
+    assert_equal 'pxelinux.0', reservation.options[:filename]
+    assert_equal '192.168.0.2', reservation.options[:nextServer]
+
+    assert_equal 15, service.leases_by_ip.values.count
+
+    lease = service.find_lease_by_ip('192.168.0.0', '192.168.0.3')
+    assert_not_nil lease
+    assert_equal '44:fa:23:05:1b:8b', lease.mac
+    assert_equal 'active', lease.state
+  end
 end

data/test/fixtures/config/dhcp.leases

@@ -0,0 +1,15 @@
+1563548437 22:12:1d:6f:46:25 192.168.0.221 no *
+1563545331 2c:68:57:40:f6:50 192.168.0.217 some-host *
+1563555257 28:3b:bf:dc:54:03 192.168.0.213 * *
+1563545265 e8:a2:ed:ec:47:dc 192.168.0.13 important-host *
+1563548921 44:fa:23:05:1b:8b 192.168.0.3 early-host fa:b2:05:1a:8b:10:01:00:01:24:b4:92:e0:64:66:b3:05:1b:8b
+1563555097 a4:c3:91:a5:4f:0a 192.168.0.152 another-host *
+1563546877 10:17:06:cd:02:2a 192.168.0.204 yet-more-hosts *
+1563553309 1c:9a:7b:ea:18:a4 192.168.0.205 * *
+1563549911 a4:43:30:66:16:71 192.168.0.115 less-important-host *
+1563551583 40:29:42:00:27:49 192.168.0.9 small-host *
+1563541055 20:e2:49:e5:d4:7a 192.168.0.215 big-host *
+1563549214 20:7a:44:49:e6:31 192.168.0.20 most-hosts *
+1563541281 b4:c7:92:b5:4f:45 192.168.0.150 another-entry *
+1563545865 00:2b:16:93:9a:e0 192.168.0.138 example *
+1563551346 a4:42:30:6d:82:1a 192.168.0.106 last-host *

data/test/fixtures/config/dhcp/dhcphosts/22_12_1d_6f_46_25.conf

@@ -0,0 +1 @@
+22:12:1d:6f:46:25,set:bf_pxelinux_0,set:ns_tftp_server_local,192.168.0.221,no

data/test/fixtures/config/dhcp/dhcpopts.conf

@@ -0,0 +1,2 @@
+tag:bf_pxelinux_0,option:bootfile-name,pxelinux.0
+tag:ns_tftp_server_local,option:tftp-server,tftp.server.local

data/test/fixtures/config/dnsmasq.conf

@@ -0,0 +1,32 @@
+conf-file=/etc/dnsmasq.conf
+dhcp-authoritative
+domain-needed
+no-hosts
+localise-queries
+bogus-priv
+expand-hosts
+local-service
+quiet-dhcp
+port=53
+domain=example.com
+server=/example.com/
+server=8.8.8.8
+server=8.8.4.4
+dhcp-leasefile=/tmp/dhcp.leases
+resolv-file=/etc/resolv.conf
+addn-hosts=/tmp/hosts
+conf-dir=/tmp/dnsmasq.d
+stop-dns-rebind
+rebind-localhost-ok
+dhcp-broadcast=tag:needs-broadcast
+
+dhcp-host=00:11:22:33:44:55,192.168.0.7,host1
+dhcp-host=10:20:30:40:50:60,192.168.0.20,host2
+dhcp-host=52:52:52:52:52:52,192.168.0.25,host3
+
+dhcp-boot=tag:00:11:22:33:44:55,pxelinux.0,192.168.0.2
+
+
+dhcp-range=lan,192.168.0.200,192.168.0.223,255.255.255.0,12h
+dhcp-option=lan,6,192.168.0.1
+no-dhcp-interface=eth2

data/test/fixtures/dhcphosts/01_02_03_04_05_06.conf

@@ -0,0 +1 @@
+01:02:03:04:05:06,set:bf_pxelinux_0,set:ns_tftp_server_local,10.0.0.1,example

data/test/fixtures/dhcpopts.conf

@@ -0,0 +1,14 @@
+tag:bf_pxelinux_0,option:bootfile-name,pxelinux.0
+
+tag:bf_pxelinux_1,option:bootfile-name,pxelinux.1
+
+
+tag:bf_pxelinux_2,option:bootfile-name,pxelinux.2
+tag:bf_pxelinux_3,option:bootfile-name,pxelinux.3
+
+tag:bf_pxelinux_4,option:bootfile-name,pxelinux.4
+
+tag:ns_tftp_server,option:tftp-server,tftp.server
+
+tag:ns_tftp_server_local,option:tftp-server,tftp.server.local
+tag:ns_tftp_server,option:tftp-server,tftp.server

data/test/test_helper.rb

@@ -1,3 +1,11 @@
+# frozen_string_literal: true
+
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/test/'
+  add_filter '/vendor/'
+end
+
 require 'test/unit'
 require 'mocha/setup'
 require 'json'

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dhcp_dnsmasq
 version: !ruby/object:Gem::Version
-  version: '0.7'
+  version: '1.0'
 platform: ruby
 authors:
 - Alexander Olofsson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-12 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  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'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  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'
+date: 2019-10-29 00:00:00.000000000 Z
+dependencies: []
 description: dnamasq DHCP provider plugin for Foreman's smart proxy
 email:
 - alexander.olofsson@liu.se
@@ -64,15 +22,21 @@ files:
 - bundler.d/dhcp_dnsmasq.rb
 - config/dhcp_dnsmasq.yml
 - lib/smart_proxy_dhcp_dnsmasq.rb
-- lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_configuration.rb
 - lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_main.rb
 - lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_plugin.rb
 - lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_subnet_service.rb
 - lib/smart_proxy_dhcp_dnsmasq/dhcp_dnsmasq_version.rb
+- lib/smart_proxy_dhcp_dnsmasq/plugin_configuration.rb
 - test/dhcp_dnsmasq_default_settings_test.rb
 - test/dhcp_dnsmasq_production_wiring_test.rb
 - test/dhcp_dnsmasq_record_handling_test.rb
 - test/dhcp_dnsmasq_subnet_service_test.rb
+- test/fixtures/config/dhcp.leases
+- test/fixtures/config/dhcp/dhcphosts/22_12_1d_6f_46_25.conf
+- test/fixtures/config/dhcp/dhcpopts.conf
+- test/fixtures/config/dnsmasq.conf
+- test/fixtures/dhcphosts/01_02_03_04_05_06.conf
+- test/fixtures/dhcpopts.conf
 - test/test_helper.rb
 homepage: https://github.com/theforeman/smart_proxy_dhcp_dnsmasq
 licenses:
@@ -93,13 +57,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: dnsmasq DHCP provider plugin for Foreman's smart proxy
 test_files:
-- test/test_helper.rb
-- test/dhcp_dnsmasq_subnet_service_test.rb
+- test/fixtures/config/dhcp.leases
+- test/fixtures/config/dhcp/dhcphosts/22_12_1d_6f_46_25.conf
+- test/fixtures/config/dhcp/dhcpopts.conf
+- test/fixtures/config/dnsmasq.conf
+- test/fixtures/dhcphosts/01_02_03_04_05_06.conf
+- test/fixtures/dhcpopts.conf
 - test/dhcp_dnsmasq_default_settings_test.rb
 - test/dhcp_dnsmasq_production_wiring_test.rb
 - test/dhcp_dnsmasq_record_handling_test.rb
+- test/dhcp_dnsmasq_subnet_service_test.rb
+- test/test_helper.rb