foreman_bootdisk 4.0.1 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1efb079d68935777825c7c979322ded482808c4a
-  data.tar.gz: a01ad93b9680558aac5234bc7f9b1545076a22c6
+  metadata.gz: f47f571066b7c564c077c4aaa714c6e0ce3fc74e
+  data.tar.gz: 683ef371d2cb265cf2d8b54beecf54645a49603c
 SHA512:
-  metadata.gz: 2866d33e1fdf7dfd4280aa0ddcc2306172e495a9a253eed2b889b030bce787209e0f5491546c95c6a39452fee6e1e468877b9ba335b1645b85f73c4e8d1c0a0e
-  data.tar.gz: be89f39658774049af6d8f62126e573b0f69bcedee8913a0d3caa35575a5d95f77a98495cbd694a06b69b414e3c91bba0bd1ec5d516dcb5bfb89c0cb0503b36e
+  metadata.gz: c8a7aa167e18ad4741ee04dd68cd0a70bcf4b195697bcccc10b8d7132eff40adae3589f84f385e1f9e8eef7f38e84c6d26be29714a66fa9d883853b711387317
+  data.tar.gz: 8e5a186803695d0f4c0ca5e2229742c4614eb13e7e23dbf767eb5697a7f258a10ae783f39edc7d21e27fe3dcb73accaacfa8dea1fcd0ad938e4fe1c6dea02abb

data/CHANGES.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v4.0.2
+* fix controller compatibility with Foreman 1.7
+* fix foreman_url error when building generic ISO
+* add functional tests
+* fix seed idempotency test
+
 ## v4.0.1
 * rake task accepts a dir for the output path, and falls back to a temporary
   directory if the cwd is not writable (#7370)

data/app/controllers/foreman_bootdisk/api/v2/disks_controller.rb

@@ -10,7 +10,7 @@ module ForemanBootdisk
           api_base_url "/bootdisk/api"
         end
 
-        before_filter :find_host, :only => :host
+        before_filter :find_resource, :only => :host
         skip_after_filter :log_response_body
 
         # no-op, but required for apipie documentation
@@ -44,23 +44,8 @@ module ForemanBootdisk
 
         private
 
-        def action_permission
-          case params[:action]
-            when 'generic'
-              :download
-            when 'host'
-              :view
-          else
-            super
-          end
-        end
-
-        def find_host
-          find_resource('hosts')
-        end
-
-        def resource_class
-          Host::Managed
+        def resource_scope
+          Host::Managed.authorized('view_hosts')
         end
       end
     end

data/app/services/foreman_bootdisk/renderer.rb

@@ -11,7 +11,7 @@ module ForemanBootdisk
       end
 
       tmpl = ConfigTemplate.find_by_name(Setting[:bootdisk_generic_host_template]) || raise(::Foreman::Exception.new(N_('Unable to find template specified by %s setting'), 'bootdisk_generic_host_template'))
-      @host = Struct.new(:token).new(nil)
+      @host = Struct.new(:token, :subnet).new(nil, nil)
       unattended_render(tmpl.template)
     end
 

data/db/seeds.d/50-bootdisk_templates.rb

@@ -2,24 +2,32 @@ kind = TemplateKind.find_or_create_by_name('Bootdisk')
 
 ConfigTemplate.without_auditing do
   content = File.read(File.join(ForemanBootdisk::Engine.root, 'app', 'views', 'foreman_bootdisk', 'host.erb'))
-  ConfigTemplate.find_or_create_by_name(
+  tmpl = ConfigTemplate.find_or_create_by_name(
     :name => 'Boot disk iPXE - host',
     :template_kind_id => kind.id,
     :snippet => false,
     :template => content
-  ).update_attributes(:template => content,
-                      :default  => true,
-                      :vendor   => "Foreman boot disk",
-                      :locked   => true)
+  )
+  tmpl.attributes = {
+    :template => content,
+    :default  => true,
+    :vendor   => "Foreman boot disk",
+    :locked   => true
+  }
+  tmpl.save!(:validate => false) if tmpl.changes.present?
 
   content = File.read(File.join(ForemanBootdisk::Engine.root, 'app', 'views', 'foreman_bootdisk', 'generic_host.erb'))
-  ConfigTemplate.find_or_create_by_name(
+  tmpl = ConfigTemplate.find_or_create_by_name(
     :name => 'Boot disk iPXE - generic host',
     :template_kind_id => kind.id,
     :snippet => false,
     :template => content
-  ).update_attributes(:template => content,
-                      :default  => true,
-                      :vendor   => "Foreman boot disk",
-                      :locked   => true)
+  )
+  tmpl.attributes = {
+    :template => content,
+    :default  => true,
+    :vendor   => "Foreman boot disk",
+    :locked   => true
+  }
+  tmpl.save!(:validate => false) if tmpl.changes.present?
 end

data/lib/foreman_bootdisk/version.rb

@@ -1,3 +1,3 @@
 module ForemanBootdisk
-  VERSION = '4.0.1'
+  VERSION = '4.0.2'
 end

data/lib/tasks/bootdisk.rake

@@ -47,3 +47,25 @@ namespace :bootdisk do
     end
   end
 end
+
+# Tests
+namespace :test do
+  desc "Test foreman_bootdisk"
+  Rake::TestTask.new(:foreman_bootdisk) do |t|
+    test_dir = File.join(File.dirname(__FILE__), '../..', 'test')
+    t.libs << ["test",test_dir]
+    t.pattern = "#{test_dir}/**/*_test.rb"
+    t.verbose = true
+  end
+end
+
+Rake::Task[:test].enhance do
+  Rake::Task['test:foreman_bootdisk'].invoke
+end
+
+load 'tasks/jenkins.rake'
+if Rake::Task.task_defined?(:'jenkins:unit')
+  Rake::Task["jenkins:unit"].enhance do
+    Rake::Task['test:foreman_bootdisk'].invoke
+  end
+end

data/test/functional/foreman_bootdisk/api/v2/disks_controller_test.rb

@@ -0,0 +1,33 @@
+require 'test_plugin_helper'
+
+class ForemanBootdisk::Api::V2::DisksControllerTest < ActionController::TestCase
+  setup :setup_bootdisk
+
+  test "should generate generic image" do
+    ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/generic host template/))).yields("temp ISO")
+    File.expects(:read).with("temp ISO").returns("ISO image")
+    get :generic, {}
+    assert_response :success
+    assert_equal "ISO image", @response.body
+  end
+
+  describe "#host" do
+    setup :setup_host
+
+    test "should generate host image" do
+      ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/host template/))).yields("temp ISO")
+      File.expects(:read).with("temp ISO").returns("ISO image")
+      get :host, {:id => @host.name}
+      assert_response :success
+      assert_equal "ISO image", @response.body
+    end
+
+    test "should generate full host image" do
+      ForemanBootdisk::ISOGenerator.expects(:generate_full_host).with(@host).yields("temp ISO")
+      File.expects(:read).with("temp ISO").returns("ISO image")
+      get :host, {:id => @host.name, :full => true}
+      assert_response :success
+      assert_equal "ISO image", @response.body
+    end
+  end
+end

data/test/functional/foreman_bootdisk/disks_controller_test.rb

@@ -0,0 +1,38 @@
+require 'test_plugin_helper'
+
+class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
+  setup :setup_bootdisk
+
+  test "should generate generic image" do
+    ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/generic host template/))).yields("temp ISO")
+    File.expects(:read).with("temp ISO").returns("ISO image")
+    get :generic, {}, set_session_user
+    assert_response :success
+    assert_equal "ISO image", @response.body
+  end
+
+  describe "#host" do
+    setup :setup_host
+
+    test "should generate host image" do
+      ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/host template/))).yields("temp ISO")
+      File.expects(:read).with("temp ISO").returns("ISO image")
+      get :host, {:id => @host.name}, set_session_user
+      assert_response :success
+      assert_equal "ISO image", @response.body
+    end
+
+    test "should generate full host image" do
+      ForemanBootdisk::ISOGenerator.expects(:generate_full_host).with(@host).yields("temp ISO")
+      File.expects(:read).with("temp ISO").returns("ISO image")
+      get :full_host, {:id => @host.name}, set_session_user
+      assert_response :success
+      assert_equal "ISO image", @response.body
+    end
+  end
+
+  test "should render help" do
+    get :help, {}, set_session_user
+    assert_response :success
+  end
+end

data/test/test_plugin_helper.rb

@@ -0,0 +1,26 @@
+require 'test_helper'
+
+class ActionController::TestCase
+  def setup_bootdisk
+    setup_routes
+    setup_settings
+    setup_templates
+  end
+
+  def setup_routes
+    @routes = ForemanBootdisk::Engine.routes
+  end
+
+  def setup_settings
+    Setting::Bootdisk.load_defaults
+  end
+
+  def setup_templates
+    load File.join(File.dirname(__FILE__), '..', 'db', 'seeds.d', '50-bootdisk_templates.rb')
+  end
+
+  def setup_host
+    subnet = FactoryGirl.create(:subnet, :gateway => '10.0.1.254', :dns_primary => '8.8.8.8')
+    @host = FactoryGirl.create(:host, :subnet => subnet)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies: []
 description: Plugin for Foreman that creates iPXE-based boot disks to provision hosts
   without the need for PXE infrastructure.
@@ -24,7 +24,6 @@ files:
 - CHANGES.md
 - LICENSE
 - README.md
-- Rakefile
 - app/controllers/concerns/foreman_bootdisk/unattended_controller_ext.rb
 - app/controllers/foreman_bootdisk/api/v2/disks_controller.rb
 - app/controllers/foreman_bootdisk/disks_controller.rb
@@ -79,6 +78,9 @@ files:
 - locale/zh_CN/foreman_bootdisk.po
 - locale/zh_TW/LC_MESSAGES/foreman_bootdisk.mo
 - locale/zh_TW/foreman_bootdisk.po
+- test/functional/foreman_bootdisk/api/v2/disks_controller_test.rb
+- test/functional/foreman_bootdisk/disks_controller_test.rb
+- test/test_plugin_helper.rb
 homepage: http://github.com/theforeman/foreman_bootdisk
 licenses:
 - GPL-3

data/Rakefile

@@ -1,105 +0,0 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'rake'
-require 'fileutils'
-
-task :default => :test
-
-PLUGIN_NAME = "bootdisk"
-ENGINE_DIR = File.expand_path('..', __FILE__)
-FOREMAN_DIR = '.foreman_app'
-
-ENV['TEXTDOMAIN'] = PLUGIN_NAME
-import "#{FOREMAN_DIR}/Rakefile" if File.exists? "#{FOREMAN_DIR}/Rakefile"
-
-namespace :setup do
-  desc "Download latest foreman core devel source and install dependencies"
-  task :foreman_prepare do
-    foreman_repo = 'https://github.com/theforeman/foreman.git'
-    foreman_gemfile = File.join(FOREMAN_DIR, "Gemfile")
-    unless File.exists?(foreman_gemfile)
-      puts "Foreman source code is not present at #{FOREMAN_DIR}"
-      puts "Downloading latest Foreman development branch into #{FOREMAN_DIR}..."
-      FileUtils.mkdir_p(FOREMAN_DIR)
-
-      unless system("git clone --depth 1 #{foreman_repo} #{FOREMAN_DIR}")
-        puts "Error while getting latest Foreman code from #{foreman_repo} into #{FOREMAN_DIR}"
-        fail
-      end
-    end
-
-    settings_file = "#{FOREMAN_DIR}/config/settings.yaml"
-    unless File.exists?(settings_file)
-      puts 'Preparing settings file'
-      FileUtils.copy("#{settings_file}.example", settings_file)
-    end
-
-    db_file = "#{FOREMAN_DIR}/config/database.yml"
-    unless File.exists?(db_file)
-      puts 'Preparing database file'
-      FileUtils.copy("#{db_file}.example", db_file)
-    end
-
-    ["#{ENGINE_DIR}/.bundle/config", "#{FOREMAN_DIR}/.bundle/config"].each do |bundle_file|
-      unless File.exists?(bundle_file)
-        FileUtils.mkdir_p(File.dirname(bundle_file))
-        puts 'Preparing bundler configuration'
-        File.open(bundle_file, 'w') { |f| f << <<FILE }
----
-BUNDLE_WITHOUT: console:development:fog:gce:jsonp:libvirt:mysql:mysql2:ovirt:postgresql:vmware
-FILE
-      end
-    end
-
-    local_gemfile = "#{FOREMAN_DIR}/bundler.d/Gemfile.local.rb"
-    unless File.exist?(local_gemfile)
-      File.open(local_gemfile, 'w') { |f| f << <<GEMFILE }
-gem "facter"
-GEMFILE
-    end
-
-    puts 'Installing dependencies...'
-    unless system('bundle install')
-      fail
-    end
-  end
-
-  task :db_prepare do
-    unless File.exists?(FOREMAN_DIR)
-      puts <<MESSAGE
-Foreman source code not prepared. Run
-
-  rake setup:foreman_prepare
-
-to download foreman source and its dependencies
-MESSAGE
-      fail
-    end
-
-    # once we are Ruby19 only, switch to block variant of cd
-    pwd = FileUtils.pwd
-    FileUtils.cd(FOREMAN_DIR)
-    unless system('bundle exec rake db:test:prepare RAILS_ENV=test')
-      puts "Migrating database first"
-      system('bundle exec rake db:migrate db:schema:dump') || fail
-    end
-    FileUtils.cd(pwd)
-  end
-
-  task :all => [:foreman_prepare, :db_prepare]
-end
-
-namespace :test do
-  task :set_loadpath do
-    %w[lib test].each do |dir|
-      $:.unshift(File.expand_path(dir, ENGINE_DIR))
-    end
-  end
-
-  task :all => ['setup:db_prepare', 'test:set_loadpath'] do
-    Dir.glob('test/**/*_test.rb') { |f| require f.sub('test/','') unless f.include? '.foreman_app/' }
-  end
-end
-
-task :test => 'test:all'