smart_proxy_dhcp_remote_isc 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9573da004f6366a2b3ef71e4215101d63564dc52
-  data.tar.gz: 98c1ca6e725252813d5987eaa6b018c12c5c83ee
+SHA256:
+  metadata.gz: 54cb8f5d6a4e40a2f4f13a888ac1df66e9113fb29910c7911dc166af6e3cd5c7
+  data.tar.gz: 81964c0de192cb59c8db20b1662f95b055dfa26d6694a26c9f7262776d614acf
 SHA512:
-  metadata.gz: 1b1caa58f6371c4afcdfb5c95b42618b8becd6490bd8a3419ce6bf4d33453490d986cbd6092238922c7d931bbbb2b8d1fc3e8bfc3224abd2fc44a169c4b09c3c
-  data.tar.gz: 93c09c1bbd822f9e1da50030634dbc895b1286f63c748bad314267639c4f832f65a213f82cadf9242e292684d518e21510d7b7dc8d75c9bc8260046c70f790ff
+  metadata.gz: d2c6544702a8b3b283ea3766956f1e56f2dbead04a3fa009f0810278f00d89c4d6f201739e7005b5b6e9d1a181f9b1898c2b258ce3215cc13d7f639ee9e30e70
+  data.tar.gz: 23fb0984b315bbd79a07a808d866c05cf37bad56804dbe7333eedaf3b4f2d89a5a21d0306d9ff4de9ac14b5ea7faabc4faff23d2d7474958c492eef7a6e5c8d0

data/README.md

@@ -1,5 +1,7 @@
 # SmartProxyDhcpRemoteISC
 
+[![Build Status](https://travis-ci.org/theforeman/smart_proxy_dhcp_remote_isc.svg?branch=master)](https://travis-ci.org/theforeman/smart_proxy_dhcp_remote_isc)
+
 This plugin allows to interface with ISC dhcpd servers that have configuration and lease files shared over NFS
 
 ## Installation
@@ -11,7 +13,7 @@ This plugin is compatible with Smart Proxy 1.15 or higher.
 
 When installing using "gem", make sure to install the bundle file:
 
-    echo "gem 'smart_proxy_dhcp_infoblox'" > /usr/share/foreman-proxy/bundler.d/dhcp_remote_isc.rb
+    echo "gem 'smart_proxy_dhcp_remote_isc'" > /usr/share/foreman-proxy/bundler.d/dhcp_remote_isc.rb
 
 ## Configuration
 

data/bundler.d/dhcp_remote_isc.rb

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

data/lib/smart_proxy_dhcp_remote_isc/version.rb

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

data/test/integration_test.rb

@@ -0,0 +1,134 @@
+require "rack/test"
+require 'test_helper'
+require 'json'
+require 'dhcp_common/dhcp_common'
+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'
+require 'smart_proxy_dhcp_remote_isc/subnet_service_initializer'
+require 'dhcp/dhcp'
+require 'dhcp/dependency_injection'
+require 'dhcp/dhcp_api'
+
+ENV['RACK_ENV'] = 'test'
+
+class IntegrationTest < ::Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  class SubnetServiceInitializerForTesting < Proxy::DHCP::RemoteISC::SubnetServiceInitializer
+    def read_leases_file
+      return <<EOF
+host testing-01 { hardware ethernet 11:22:33:a9:61:09; fixed-address 10.0.0.200; dynamic; }
+EOF
+    end
+
+    def read_config_file
+      return <<EOF
+subnet 10.0.0.0 netmask 255.255.255.0 {
+}
+EOF
+    end
+  end
+
+  class IscOmapiProviderForTesting < Proxy::DHCP::CommonISC::IscOmapiProvider
+    def om
+      @om ||= StringIO.new
+    end
+
+    def om_disconnect(msg)
+      @om = nil
+    end
+  end
+
+  def app
+    app = Proxy::DhcpApi.new
+    app.helpers.server = @server
+    app
+  end
+
+  def setup
+    @subnet_service = ::Proxy::DHCP::SubnetService.new(::Proxy::MemoryStore.new, ::Proxy::MemoryStore.new, ::Proxy::MemoryStore.new,
+                                                       ::Proxy::MemoryStore.new, ::Proxy::MemoryStore.new)
+    @parser = ::Proxy::DHCP::CommonISC::ConfigurationParser.new
+
+    subnet_service_initializer =
+        SubnetServiceInitializerForTesting.new("config_path", "leases_path", @parser, @subnet_service)
+    @initialized_subnet_service = subnet_service_initializer.initialized_subnet_service
+
+    @free_ips = ::Proxy::DHCP::FreeIps.new(10)
+
+    @server = IscOmapiProviderForTesting.new("127.0.0.1", '7911', [], 'key', 'secret', @initialized_subnet_service, @free_ips)
+
+    @expected_reservation = {"name" => "testing-01", "ip" => "10.0.0.200", "mac" => "11:22:33:a9:61:09",
+                             "subnet" => "10.0.0.0/255.255.255.0", "type" => "reservation", "deleteable" => true,
+                             "hostname" => "testing-01", "hardware_type" => "ethernet"}
+  end
+
+
+  def test_get_subnets
+    get "/"
+
+    assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"
+    parsed_response = JSON.parse(last_response.body)
+    assert_equal 1, parsed_response.size
+    assert_equal "10.0.0.0", parsed_response.first['network']
+    assert_equal "255.255.255.0", parsed_response.first['netmask']
+  end
+
+  def test_get_network
+    get "/10.0.0.0"
+
+    assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"
+    parsed_response = JSON.parse(last_response.body)
+    assert parsed_response.key?('reservations')
+    assert_equal 1, parsed_response['reservations'].size
+    assert parsed_response.key?('leases')
+    assert parsed_response['leases'].empty?
+    assert_equal@expected_reservation, parsed_response['reservations'].first
+  end
+
+  def test_get_unused_ip
+    get "/10.0.0.0/unused_ip"
+
+    assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"
+    parsed_response = JSON.parse(last_response.body)
+    assert parsed_response.key?('ip')
+  end
+
+  def test_get_records_by_ip
+    get "/10.0.0.0/ip/10.0.0.200"
+    assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"
+    parsed_response = JSON.parse(last_response.body)
+    assert_equal 1, parsed_response.size
+    assert_equal @expected_reservation, parsed_response.first
+  end
+
+  def test_get_record_by_mac
+    get "/10.0.0.0/mac/11:22:33:a9:61:09"
+    assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"
+    assert_equal @expected_reservation, JSON.parse(last_response.body)
+  end
+
+  def test_create_record
+    record = {
+        "hostname" => "test-02",
+        "ip"       => "10.0.0.250",
+        "mac"      => "10:10:10:10:10:10",
+        "network"  => "10.0.0.0",
+    }
+    post "/10.0.0.0", record
+    assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"
+  end
+
+  def test_delete_records_by_ip
+    delete "/10.0.0.0/ip/10.0.0.200"
+    assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"
+  end
+
+  def test_delete_record_by_mac
+    delete "/10.0.0.0/mac/11:22:33:a9:61:09"
+    assert last_response.ok?, "Last response was not ok: #{last_response.status} #{last_response.body}"
+  end
+end

data/test/test_helper.rb

@@ -1,5 +1,5 @@
 require 'test/unit'
-require 'mocha/setup'
+require 'mocha/test_unit'
 
 require 'smart_proxy_for_testing'
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_dhcp_remote_isc
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Dmitri Dolguikh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-18 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1'
 description: Smart-Proxy dhcp module provider for NFS-accessible ISC dhcpd installations
 email:
 - dmitri@appliedlogic.ca
@@ -40,6 +40,7 @@ files:
 - 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
+- test/integration_test.rb
 - test/plugin_configuration_test.rb
 - test/test_helper.rb
 homepage: https://github.com/theforeman/smart_proxy_dhcp_remote_isc
@@ -61,11 +62,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Smart-Proxy dhcp module provider for NFS-accessible ISC dhcpd installations
 test_files:
+- test/integration_test.rb
 - test/plugin_configuration_test.rb
 - test/test_helper.rb