smart_proxy_dhcp_device42 1.0.4 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b060da2f4f3ba7a2079d3b055581bff788ea048
-  data.tar.gz: 5698c44288c4a2f4403af0845327f7911dbf58d7
+  metadata.gz: 720587ff8e5e3c27316e02285178dafe2b8a4cd5
+  data.tar.gz: e2d27fe1e2c7a00566f2779cceafff35a96be08b
 SHA512:
-  metadata.gz: 1a818d400d61757938f7864ff53dfdfb73bc056a55e7d5f13f89d08b789c793e1da98bd46787f764150a8cbb2f8029714ba0b36588e06f8ca8df356c414ee946
-  data.tar.gz: 4dcebf75f8f001a2638e19b46b3b896da25988b2fb1e9b5691fc409a237dbfe565f96bcb399c5da4f2d798e27c39bc99154a3e1886524d648f7ec2b7f6d7998a
+  metadata.gz: 06102dcdd46fa4f8d26d22d677008dc5c38f98c7e3870c4b8f10de26bfaa5243faa2993b49557bc996f0a526a502c886e10cfa187568dc1a2abab1b8a25ce05a
+  data.tar.gz: 1cd2fa271260a0358a687ae500beffedccf60b2b343d8e8b271dbac34457e26bb91a91c87a9e1ff30788b29847c7211d3855bb68240ab044958ff3e74157baaf

data/README.md

@@ -18,13 +18,13 @@ When installing using "gem", make sure to install the bundle file:
 To enable this DHCP provider, edit `/etc/foreman-proxy/settings.d/dhcp.yml` and set:
 
     :use_provider: dhcp_device42
-    :scheme: server scheme
-    :verify: secure verification ( bool )
-    :server: IP of device42 server
     :subnets: subnets you want to use (optional unless you set device42_subnets to false)
 
 Configuration options for this plugin are in `/etc/foreman-proxy/settings.d/dhcp_device42.yml` and include:
 
+    :scheme: server scheme
+    :verify: secure verification ( bool )
+    :server: IP of device42 server
     :username: API Username
     :password: API Password
 

data/config/dhcp_device42.yml.example

@@ -0,0 +1,9 @@
+---
+#
+# Configuration file for 'dhcp_device42' dhcp provider
+#
+:scheme: http
+:verify: false
+:server: 192.168.0.2
+:username: "username"
+:password: "password"

data/lib/smart_proxy_dhcp_device42.rb

@@ -5,5 +5,8 @@ module Proxy
 end
 
 require 'smart_proxy_dhcp_device42/plugin_configuration'
+require 'smart_proxy_dhcp_device42/scheme_validator'
+require 'smart_proxy_dhcp_device42/verify_validator'
+require 'smart_proxy_dhcp_device42/module_loader'
 require 'smart_proxy_dhcp_device42/dhcp_device42_version'
 require 'smart_proxy_dhcp_device42/dhcp_device42_plugin'

data/lib/smart_proxy_dhcp_device42/device42_api.rb

@@ -23,10 +23,6 @@ class Device42
 
     def rest_get(endpoint, querystring)
       response = HTTParty.get("%s://%s/api/1.0/%s/%s" % [@scheme, @host, endpoint, querystring], {
-                                :headers => {
-                                  'Content-Type' => 'application/x-www-form-urlencoded',
-                                  'charset' => 'utf-8'
-                                },
                                 :basic_auth => { :username => @username, :password => @password },
                                 :verify => @verify
                            })
@@ -37,8 +33,7 @@ class Device42
       response = HTTParty.post("%s://%s/api/1.0/%s/" % [@scheme, @host, endpoint], {
                                 :body => body,
                                 :headers => {
-                                  'Content-Type' => 'application/x-www-form-urlencoded',
-                                  'charset' => 'utf-8'
+                                  'Content-Type' => 'application/x-www-form-urlencoded'
                                 },
                                 :basic_auth => { :username => @username, :password => @password },
                                 :verify => @verify
@@ -61,8 +56,7 @@ class Device42
                                   :query => query
                                 },
                                 :headers => {
-                                  'Content-Type' => 'application/x-www-form-urlencoded',
-                                  'charset' => 'utf-8'
+                                  'Content-Type' => 'application/x-www-form-urlencoded'
                                 },
                                 :basic_auth => { :username => @username, :password => @password },
                                 :verify => @verify
@@ -84,15 +78,22 @@ class Device42
       rest_post('ips', ip)
     end
 
-    def remove_host(name)
-      device = {
-        :name => name
-      }
-      response = JSON.parse(rest_post('devices', device))
-      device_id = response['msg'][1]
+    def remove_host(hostname)
+      response = JSON.parse(rest_get('devices/name', hostname))
+      device_id = response['id']
       rest_delete('devices', device_id)
     end
 
+    def get_hosts(network_address)
+      csv = doql("SELECT d.name, i.ip_address, n.hwaddress, s.network, s.mask_bits FROM view_subnet_v1 s
+                  JOIN view_ipaddress_v1 i ON i.subnet_fk = s.subnet_pk
+                  JOIN view_device_v1 d ON d.device_pk = i.device_fk
+                  JOIN view_netport_v1 n ON n.netport_pk = i.netport_fk
+                  WHERE s.network in ('%s')
+                  AND i.available = False" % network_address)
+      return csv_to_array(csv)
+    end
+
     def get_hosts_by_ip(ip)
       csv = doql("SELECT d.name, i.ip_address, n.hwaddress, s.network, s.mask_bits FROM view_ipaddress_v1 i
                   JOIN view_device_v1 d ON d.device_pk = i.device_fk

data/lib/smart_proxy_dhcp_device42/dhcp_device42_main.rb

@@ -46,6 +46,21 @@ module Proxy::DHCP::Device42
       difined_subnets
     end
 
+    def all_hosts(network_address)
+      records = @connection.get_hosts(network_address)
+      return [] if records.empty?
+      reservs = []
+      records.each do |record|
+        reserv = build_reservation(record)
+        reservs.push(reserv) if !reserv.nil?
+      end
+      reservs
+    end
+
+    def all_leases(network_address)
+      [] # device42 doesn't support leases
+    end
+
     def unused_ip(subnet, _, from_ip_address, to_ip_address)
       @connection.get_next_ip(subnet, from_ip_address, to_ip_address)
     end

data/lib/smart_proxy_dhcp_device42/dhcp_device42_plugin.rb

@@ -2,11 +2,17 @@ module Proxy::DHCP::Device42
   class Plugin < ::Proxy::Provider
     plugin :dhcp_device42, ::Proxy::DHCP::Device42::VERSION
 
-    validate_presence :username, :password
+    validate_presence :username, :password, :server, :scheme, :verify
 
     requires :dhcp, '>= 1.16'
 
     load_classes ::Proxy::DHCP::Device42::PluginConfiguration
     load_dependency_injection_wirings ::Proxy::DHCP::Device42::PluginConfiguration
+    override_module_loader_class ::Proxy::DHCP::Device42::ModuleLoader
+
+    load_validators :scheme_validator => ::Proxy::DHCP::Device42::SchemeValidator, :verify_validator => ::Proxy::DHCP::Device42::VerifyValidator
+
+    validate :scheme, :scheme_validator => true
+    validate :verify, :verify_validator => true
   end
 end

data/lib/smart_proxy_dhcp_device42/dhcp_device42_version.rb

@@ -1,7 +1,7 @@
 module Proxy
   module DHCP
     module Device42
-      VERSION = '1.0.4'
+      VERSION = '1.0.7'
     end
   end
 end

data/lib/smart_proxy_dhcp_device42/module_loader.rb

@@ -0,0 +1,6 @@
+class ::Proxy::DHCP::Device42::ModuleLoader < ::Proxy::DefaultModuleLoader
+  def log_provider_settings(settings)
+    super(settings)
+    logger.warn("http is used for connection to Device42 appliance") if settings[:scheme] != 'https' 
+  end
+end

data/lib/smart_proxy_dhcp_device42/scheme_validator.rb

@@ -0,0 +1,8 @@
+module ::Proxy::DHCP::Device42
+  class SchemeValidator < ::Proxy::PluginValidators::Base
+    def validate!(settings)
+      return true if ['http', 'https'].include?(settings[:scheme])
+      raise ::Proxy::Error::ConfigurationError, "Setting 'scheme' can be set to either 'http' or 'https'"
+    end
+  end
+end

data/lib/smart_proxy_dhcp_device42/verify_validator.rb

@@ -0,0 +1,8 @@
+module ::Proxy::DHCP::Device42
+  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
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dhcp_device42
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.7
 platform: ruby
 authors:
 - Anatolii Chmykhalo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-27 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -34,13 +34,16 @@ files:
 - LICENSE
 - README.md
 - bundler.d/dhcp_device42.rb
-- config/dhcp_device42.yml
+- config/dhcp_device42.yml.example
 - lib/smart_proxy_dhcp_device42.rb
 - lib/smart_proxy_dhcp_device42/device42_api.rb
 - lib/smart_proxy_dhcp_device42/dhcp_device42_main.rb
 - lib/smart_proxy_dhcp_device42/dhcp_device42_plugin.rb
 - lib/smart_proxy_dhcp_device42/dhcp_device42_version.rb
+- lib/smart_proxy_dhcp_device42/module_loader.rb
 - lib/smart_proxy_dhcp_device42/plugin_configuration.rb
+- lib/smart_proxy_dhcp_device42/scheme_validator.rb
+- lib/smart_proxy_dhcp_device42/verify_validator.rb
 homepage: https://www.device42.com
 licenses:
 - GPL-3.0

data/config/dhcp_device42.yml

@@ -1,8 +0,0 @@
----
-# Configuration file for 'dhcp_device42' 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: "admin"
-:password: "admin"