smart_proxy_dhcp_bluecat 0.1.5 → 0.1.6

data/lib/smart_proxy_dhcp_bluecat/dhcp_bluecat_main.rb

@@ -1,4 +1,4 @@
-require 'dhcp_common/server'
+require "dhcp_common/server"
 
 module Proxy
   module DHCP
@@ -9,118 +9,123 @@ module Proxy
         include Proxy::Util
 
         attr_reader :connection
+
         def initialize(connection, managed_subnets)
           @connection = connection
           @managed_subnets = managed_subnets
-          super('bluecat', managed_subnets, nil)
+          super("bluecat", managed_subnets, nil)
         end
 
         # returns all subnets
         def subnets
-          logger.debug('START subnets')
+          logger.debug("START subnets")
           subnets = @connection.subnets
-          logger.debug('END subnets')
-          logger.debug('Returned: ' + subnets.class.to_s + ': ' + subnets.to_s)
+          logger.debug("END subnets")
+          logger.debug("Returned: #{subnets.class}: #{subnets}")
           subnets
         end
 
         # returns all hosts in a subnet
         # in bluecat leases and hosts are the same
         def all_hosts(network_address)
-          logger.debug('START all_hosts with network_address: ' + network_address.to_s)
+          logger.debug("START all_hosts with network_address: #{network_address}")
           hosts = @connection.hosts(network_address)
-          logger.debug('END all_hosts with network_address: ' + network_address.to_s)
-          logger.debug('Returned: ' + hosts.class.to_s + ': ' + hosts.to_s)
+          logger.debug("END all_hosts with network_address: #{network_address}")
+          logger.debug("Returned: #{hosts.class}: #{hosts}")
           hosts
         end
 
         # returns all leases in a subnet
         # in bluecat leases and hosts are the same
         def all_leases(network_address)
-          logger.debug('START all_leases with network_address: ' + network_address.to_s)
+          logger.debug("START all_leases with network_address: #{network_address}")
           hosts = @connection.hosts(network_address)
-          logger.debug('END all_leases with network_address: ' + network_address.to_s)
-          logger.debug('Returned: ' + hosts.class.to_s + ': ' + hosts.to_s)
+          logger.debug("END all_leases with network_address: #{network_address}")
+          logger.debug("Returned: #{hosts.class}: #{hosts}")
           hosts
         end
 
         # returns the next free ip in a subnet
         def unused_ip(subnet, mac_address, from_ip_address, to_ip_address)
-          logger.debug('START unused_ip with subnet: ' + subnet.to_s + ' mac_address: ' + mac_address.to_s + ' from_ip_address: ' + from_ip_address.to_s + ' to_ip_address: ' + to_ip_address.to_s)
+          logger.debug("START unused_ip with subnet: #{subnet} mac_address: #{mac_address} \
+                        from_ip_address: #{from_ip_address} to_ip_address: #{to_ip_address}")
           ip = @connection.next_ip(subnet, from_ip_address, to_ip_address)
-          logger.debug('END unused_ip with subnet: ' + subnet.to_s + ' mac_address: ' + mac_address.to_s + ' from_ip_address: ' + from_ip_address.to_s + ' to_ip_address: ' + to_ip_address.to_s)
-          logger.debug('Returned: ' + ip.class.to_s + ': ' + ip.to_s)
+          logger.debug("END unused_ip with subnet: #{subnet} mac_address: #{mac_address} \
+                        from_ip_address: #{from_ip_address} to_ip_address: #{to_ip_address}")
+          logger.debug("Returned: #{ip.class}: #{ip}")
           ip
         end
 
         # returns a record
         # foreman calls this method with a ip or a mac address
         def find_record(subnet_address, address)
-          logger.debug('START find_record with subnet_address: ' + subnet_address.to_s + ' address: ' + address.to_s)
-          records = if IPAddress.valid?(address)
-                      find_records_by_ip(subnet_address, address)
-                    else
-                      find_record_by_mac(subnet_address, address)
-                    end
-          logger.debug('END find_record with subnet_address: ' + subnet_address.to_s + ' address: ' + address.to_s)
-          logger.debug('Returned: ' + records.class.to_s + ': ' + records.to_s)
+          logger.debug("START find_record with subnet_address: #{net} address: #{address}")
+          if IPAddress.valid?(address)
+            records = find_records_by_ip(subnet_address, address)
+          else
+            records = find_record_by_mac(subnet_address, address)
+          end
+          logger.debug("END find_record with subnet_address: #{subnet_address} address: #{address}")
+          logger.debug("Returned: #{records.class}: #{records}")
           return [] if records.nil?
+
           records
         end
 
         # returns a record based on a ip address
         def find_records_by_ip(subnet_address, ip)
-          logger.debug('START find_records_by_ip with subnet_address: ' + subnet_address.to_s + ' ip: ' + ip.to_s)
+          logger.debug("START find_records_by_ip with subnet_address: #{subnet_address} ip: #{ip}")
           records = @connection.hosts_by_ip(ip)
-          logger.debug('END find_records_by_ip with subnet_address: ' + subnet_address.to_s + ' ip: ' + ip.to_s)
-          logger.debug('Returned: ' + records.class.to_s + ': ' + records.to_s)
+          logger.debug("END find_records_by_ip with subnet_address: #{subnet_address} ip: #{ip}")
+          logger.debug("Returned: #{records.class}: #{records}")
           return [] if records.nil?
+
           records
         end
 
         # returns a record based on a mac address
         def find_record_by_mac(subnet_address, mac_address)
-          logger.debug('START find_record_by_mac with subnet_address: ' + subnet_address.to_s + ' mac_address: ' + mac_address.to_s)
-          record = @connection.host_by_mac(mac_address)
-          logger.debug('END find_record_by_mac with subnet_address: ' + subnet_address.to_s + ' mac_address: ' + mac_address.to_s)
-          logger.debug('Returned: ' + record.class.to_s + ': ' + record.to_s)
+          logger.debug("START find_record_by_mac with subnet_address: #{subnet_address} mac_address: #{mac_address}")
+          record = @connection.host_by_mac_and_subnet(subnet_address, mac_address)
+          logger.debug("END find_record_by_mac with subnet_address: #{subnet_address} mac_address: #{mac_address}")
+          logger.debug("Returned: #{record.class}: #{record}")
           record
         end
 
         # returns a subnet based on a subnet address
         def find_subnet(subnet_address)
-          logger.debug('START find_subnet with subnet_address: ' + subnet_address.to_s)
+          logger.debug("START find_subnet with subnet_address: #{subnet_address}")
           net = @connection.find_mysubnet(subnet_address)
-          logger.debug('END find_subnet with subnet_address: ' + subnet_address.to_s)
-          logger.debug('Returned: ' + net.class.to_s + ': ' + net.to_s)
+          logger.debug("END find_subnet with subnet_address: #{subnet_address}")
+          logger.debug("Returned: #{net.class}: #{net}")
           net
         end
 
         # returns a subnet based on a subnet address
         def get_subnet(subnet_address)
-          logger.debug('START get_subnet with subnet_address: ' + subnet_address.to_s)
+          logger.debug("START get_subnet with subnet_address: #{subnet_address}")
           net = @connection.find_mysubnet(subnet_address)
-          logger.debug('END get_subnet with subnet_address: ' + subnet_address.to_s)
-          logger.debug('Returned: ' + net.class.to_s + ': ' + net.to_s)
+          logger.debug("END get_subnet with subnet_address: #{subnet_address}")
+          logger.debug("Returned: #{net.class}: #{net}")
           net
         end
 
         # adds a host record
         def add_record(options)
-          logger.debug('START add_record with options: ' + options.to_s)
+          logger.debug("START add_record with options: #{options}")
           @connection.add_host(options)
-          logger.debug('END add_record with options: ' + options.to_s)
+          logger.debug("END add_record with options: #{options}")
         end
 
         # removes a host record
         def del_record(record)
-          logger.debug('START del_record with record: ' + record.to_s)
+          logger.debug("START del_record with record: #{record}")
           if record.empty?
-            logger.debug('record empty, nothing to do')
+            logger.debug("record empty, nothing to do")
           else
             @connection.remove_host(record.ip)
           end
-          logger.debug('END del_record with record: ' + record.to_s)
+          logger.debug("END del_record with record: #{record}")
         end
       end
     end

data/lib/smart_proxy_dhcp_bluecat/dhcp_bluecat_plugin.rb

@@ -4,9 +4,10 @@ module Proxy
       class Plugin < ::Proxy::Provider
         plugin :dhcp_bluecat, ::Proxy::DHCP::BlueCat::VERSION
 
-        validate_presence :scheme, :verify, :host, :parent_block, :view_name, :config_id, :config_name, :server_id, :username, :password
+        validate_presence :scheme, :verify, :host, :parent_block, :view_name, :config_id, :config_name, :server_id, :username,
+                          :password
 
-        requires :dhcp, '>= 1.16'
+        requires :dhcp, ">= 1.16"
 
         load_classes ::Proxy::DHCP::BlueCat::PluginConfiguration
         load_dependency_injection_wirings ::Proxy::DHCP::BlueCat::PluginConfiguration

data/lib/smart_proxy_dhcp_bluecat/dhcp_bluecat_version.rb

@@ -1,7 +1,7 @@
-module Proxy
-  module DHCP
-    module BlueCat
-      VERSION = '0.1.5'.freeze
-    end
-  end
-end
+module Proxy
+  module DHCP
+    module BlueCat
+      VERSION = "0.1.6".freeze
+    end
+  end
+end

data/lib/smart_proxy_dhcp_bluecat/module_loader.rb

@@ -4,7 +4,7 @@ module Proxy
       class ModuleLoader < ::Proxy::DefaultModuleLoader
         def log_provider_settings(settings)
           super(settings)
-          logger.warn('http is used for connection to BlueCat address manager') if settings[:scheme] != 'https'
+          logger.warn("http is used for connection to BlueCat address manager") if settings[:scheme] != "https"
         end
       end
     end

data/lib/smart_proxy_dhcp_bluecat/plugin_configuration.rb

@@ -3,33 +3,33 @@ module Proxy
     module BlueCat
       class PluginConfiguration
         def load_classes
-          require 'dhcp_common/dhcp_common'
-          require 'smart_proxy_dhcp_bluecat/bluecat_api'
-          require 'smart_proxy_dhcp_bluecat/dhcp_bluecat_main'
+          require "dhcp_common/dhcp_common"
+          require "smart_proxy_dhcp_bluecat/bluecat_api"
+          require "smart_proxy_dhcp_bluecat/dhcp_bluecat_main"
         end
 
-        def load_dependency_injection_wirings(c, settings)
-          c.dependency :connection, (lambda do
-                                       ::Proxy::DHCP::BlueCat::BlueCatAPI.new(
-                                         settings[:scheme],
-                                         settings[:verify],
-                                         settings[:host],
-                                         settings[:parent_block],
-                                         settings[:view_name],
-                                         settings[:config_name],
-                                         settings[:config_id],
-                                         settings[:server_id],
-                                         settings[:username],
-                                         settings[:password]
-                                       )
-                                     end)
+        def load_dependency_injection_wirings(conf, settings)
+          conf.dependency :connection, (lambda do
+                            ::Proxy::DHCP::BlueCat::BlueCatAPI.new(
+                              settings[:scheme],
+                              settings[:verify],
+                              settings[:host],
+                              settings[:parent_block],
+                              settings[:view_name],
+                              settings[:config_name],
+                              settings[:config_id],
+                              settings[:server_id],
+                              settings[:username],
+                              settings[:password]
+                            )
+                          end)
 
-          c.dependency :dhcp_provider, (lambda do
-                                          ::Proxy::DHCP::BlueCat::Provider.new(
-                                            c.get_dependency(:connection),
-                                            settings[:subnets]
-                                          )
-                                        end)
+          conf.dependency :dhcp_provider, (lambda do
+                            ::Proxy::DHCP::BlueCat::Provider.new(
+                              c.get_dependency(:connection),
+                              settings[:subnets]
+                            )
+                          end)
         end
       end
     end

data/lib/smart_proxy_dhcp_bluecat/settings_validator.rb

@@ -3,61 +3,80 @@ module Proxy
     module BlueCat
       class SchemeValidator < ::Proxy::PluginValidators::Base
         def validate!(settings)
-          return true if ['http', 'https'].include?(settings[:scheme])
+          return true if %w[http https].include?(settings[:scheme])
+
           raise ::Proxy::Error::ConfigurationError, "Setting 'scheme' can be set to either 'http' or 'https'"
         end
       end
+
       class VerifyValidator < ::Proxy::PluginValidators::Base
         def validate!(settings)
           return true if [true, false].include?(settings[:verify])
+
           raise ::Proxy::Error::ConfigurationError, "Setting 'verify' can be set to either 'true' or 'false' (bool)"
         end
       end
+
       class HostValidator < ::Proxy::PluginValidators::Base
         def validate!(settings)
-          return true if ['http', 'https'].include?(settings[:scheme])
+          return true if %w[http https].include?(settings[:scheme])
+
           raise ::Proxy::Error::ConfigurationError, "Setting 'scheme' can be set to either 'http' or 'https'"
         end
       end
+
       class ParentBlockValidator < ::Proxy::PluginValidators::Base
         def validate!(settings)
           return true if settings[:parent_block].is_a?(Integer)
+
           raise ::Proxy::Error::ConfigurationError, "Setting 'parent_block' must be (integer)"
         end
       end
+
       class ViewNameValidator < ::Proxy::PluginValidators::Base
         def validate!(settings)
           return true if settings[:view_name].is_a?(String)
+
           raise ::Proxy::Error::ConfigurationError, "Setting 'view_name' must be (string)"
         end
       end
+
       class ConfigIdValidator < ::Proxy::PluginValidators::Base
         def validate!(settings)
           return true if settings[:config_id].is_a?(Integer)
+
           raise ::Proxy::Error::ConfigurationError, "Setting 'parent_block' must be (integer)"
         end
       end
+
       class ConfigNameValidator < ::Proxy::PluginValidators::Base
         def validate!(settings)
           return true if settings[:config_name].is_a?(String)
+
           raise ::Proxy::Error::ConfigurationError, "Setting 'config_name' must be (string)"
         end
       end
+
       class ServerIdValidator < ::Proxy::PluginValidators::Base
         def validate!(settings)
           return true if settings[:server_id].is_a?(Integer)
+
           raise ::Proxy::Error::ConfigurationError, "Setting 'server_id' must be (integer)"
         end
       end
+
       class UsernameValidator < ::Proxy::PluginValidators::Base
         def validate!(settings)
           return true if settings[:username].is_a?(String)
+
           raise ::Proxy::Error::ConfigurationError, "Setting 'username' must be (string)"
         end
       end
+
       class PasswordValidator < ::Proxy::PluginValidators::Base
         def validate!(settings)
           return true if settings[:password].is_a?(String)
+
           raise ::Proxy::Error::ConfigurationError, "Setting 'password' must be (string)"
         end
       end

data/lib/smart_proxy_dhcp_bluecat.rb

@@ -4,8 +4,8 @@ module Proxy
   end
 end
 
-require 'smart_proxy_dhcp_bluecat/plugin_configuration'
-require 'smart_proxy_dhcp_bluecat/module_loader'
-require 'smart_proxy_dhcp_bluecat/settings_validator'
-require 'smart_proxy_dhcp_bluecat/dhcp_bluecat_version'
-require 'smart_proxy_dhcp_bluecat/dhcp_bluecat_plugin'
+require "smart_proxy_dhcp_bluecat/plugin_configuration"
+require "smart_proxy_dhcp_bluecat/module_loader"
+require "smart_proxy_dhcp_bluecat/settings_validator"
+require "smart_proxy_dhcp_bluecat/dhcp_bluecat_version"
+require "smart_proxy_dhcp_bluecat/dhcp_bluecat_plugin"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dhcp_bluecat
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Matthias Hähnel
 - The Foreman Team
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -39,20 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.50.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.50.0
 description: BlueCat DHCP provider plugin for Foreman's smart proxy
 email:
 - matthias.haehnel@sixt.com
@@ -77,7 +63,7 @@ homepage: https://github.com/theforeman/smart_proxy_dhcp_bluecat
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -85,7 +71,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -93,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: BlueCat DHCP provider plugin for Foreman's smart proxy
 test_files: []