foreman_bootdisk 10.0.2 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e1f729480f6663624d1fb96b994a381e9926c1d99f7239d02fca9a376d6ccaa
-  data.tar.gz: e94de3dd4d1dd78abac381ca057e6da44a42e0a5f9b5afbd493c29ce6310861a
+  metadata.gz: 208b518a4b2d0978e4ef072aab241305e16b327e4709f6bad1cfee39ffc7b85a
+  data.tar.gz: 758b6cba3dbeef8c95862aac8b4ded56c25e4d52224e15d962c538502baaec96
 SHA512:
-  metadata.gz: 15348dcc0e22146f014239eae49e90a0e4fd95050d44c42cab4ee461e165ea63f407b797c70001c49180d36c0fef47ca166aa01e26253d08ca2412b3cbeac7b0
-  data.tar.gz: b3f5b11e82ed73e2d0c7373f61af61fd1b861c45e2399b02e010399d24139d89ded5ecaae5663d17b19fec370e9ccec592e3dff2734f2431c9f493291ad965a5
+  metadata.gz: 98b20bf6e7304aeae69d1bc5244681fea14b2d60e8d4ab32e0f6990c5f47c9985d96d1d1491188336a84ba42d25629ce3cfe74f0cbe6e6b4a0c5525fdd8e5e21
+  data.tar.gz: eb3b37f7b7846aeb5d4179fe5f0bb74183aa48376494c6dcf9aad05d8f8dd7767b38d5ebda1cbf7d9c2479fe8b5e4957a9df74b9d440ff46c8da4e482af535e0

data/CHANGES.md

@@ -1,12 +1,17 @@
 # Changelog
 
-## v10.0.2
+## v12.0.0
+* fixed subnet image token stub (#22428)
+* moved MAC based identification to Foreman core (#22858)
+* bootdisk_raise fixed for host context (#22482)
+* fixed nil exception with PXELinux template (#23267)
+
+## v11.0.0
 * bootdisk_raise template marco works in preview mode (#22136)
 * host image works with subnet without gateway (#21106)
-
-## v10.0.1
 * Fix rake tasks are Taxonomy and User aware (#21877)
-* Revert alias_method_chain with Module#prepend for Katello 3.4 compatibility
+* database migrations support rails 5 (#21821)
+* changes to support rails 5.1
 
 ## v10.0.0
 * retry vmware iso boot 10 times before giving up (#19013)

data/README.md

@@ -45,6 +45,8 @@ gPXE images are unsupported due to lack of initrd support.
 | >= 1.12         | ~> 8.0         |
 | >= 1.13         | ~> 9.0         |
 | >= 1.15         | ~> 10.0        |
+| >= 1.17         | ~> 11.0        |
+| >= 1.18         | ~> 12.0        |
 
 # Usage
 

data/app/controllers/foreman_bootdisk/disks_controller.rb

@@ -9,7 +9,7 @@ module ForemanBootdisk
         tmpl = ForemanBootdisk::Renderer.new.generic_template_render
       rescue => e
         error_rendering(e)
-        redirect_to :back
+        redirect_back(fallback_location: '/')
         return
       end
 
@@ -24,7 +24,7 @@ module ForemanBootdisk
         tmpl = host.bootdisk_template_render
       rescue => e
         error_rendering(e)
-        redirect_to :back
+        redirect_back(fallback_location: '/')
         return
       end
 
@@ -48,7 +48,7 @@ module ForemanBootdisk
         tmpl = ForemanBootdisk::Renderer.new.generic_template_render(subnet)
       rescue => e
         error_rendering(e)
-        redirect_to :back
+        redirect_back(fallback_location: '/')
         return
       end
 

data/app/helpers/concerns/foreman_bootdisk/hosts_helper_ext.rb

@@ -1,11 +1,5 @@
 module ForemanBootdisk::HostsHelperExt
-  extend ActiveSupport::Concern
-
-  included do
-    alias_method_chain :host_title_actions, :bootdisk
-  end
-
-  def host_title_actions_with_bootdisk(*args)
+  def host_title_actions(*args)
     if @host.bootdisk_downloadable?
       title_actions(
         button_group(
@@ -24,7 +18,7 @@ module ForemanBootdisk::HostsHelperExt
       bootdisk_button_disabled
     end
 
-    host_title_actions_without_bootdisk(*args)
+    super
   end
 
   def bootdisk_button_disabled

data/app/models/concerns/foreman_bootdisk/compute_resources/vmware.rb

@@ -1,19 +1,12 @@
 module ForemanBootdisk
   module ComputeResources
     module Vmware
-      extend ActiveSupport::Concern
-
-      included do
-        alias_method_chain :capabilities, :bootdisk
-        alias_method_chain :parse_args, :bootdisk
-      end
-
-      def capabilities_with_bootdisk
-        capabilities_without_bootdisk + [:bootdisk]
+      def capabilities
+        super + [:bootdisk]
       end
 
-      def parse_args_with_bootdisk(args = {})
-        args = parse_args_without_bootdisk args
+      def parse_args(args = {})
+        args = super
         if args[:provision_method] == 'bootdisk'
           args[:cdroms] = [new_cdrom]
           args[:boot_order] = ['cdrom', 'disk']

data/app/models/concerns/foreman_bootdisk/host_ext.rb

@@ -1,13 +1,6 @@
 require 'uri'
 
 module ForemanBootdisk::HostExt
-  extend ActiveSupport::Concern
-
-  included do
-    alias_method_chain :validate_media?, :bootdisk
-    alias_method_chain :can_be_built?, :bootdisk
-  end
-
   def bootdisk_template
     ProvisioningTemplate.unscoped.find_by_name(Setting[:bootdisk_host_template]) || raise(::Foreman::Exception.new(N_('Unable to find template specified by %s setting'), 'bootdisk_host_template'))
   end
@@ -17,10 +10,6 @@ module ForemanBootdisk::HostExt
     unattended_render(bootdisk_template.template)
   end
 
-  def bootdisk_chain_url(mac = self.mac, action = 'iPXE')
-    ForemanBootdisk::Renderer.format_bootdisk_chain_url(foreman_url(action), mac)
-  end
-
   def bootdisk_build?
     provision_method == 'bootdisk'
   end
@@ -37,11 +26,11 @@ module ForemanBootdisk::HostExt
     /i.86|x86[_-]64/ =~ architecture.name
   end
 
-  def validate_media_with_bootdisk?
-    validate_media_without_bootdisk? || (managed && bootdisk_build? && build?)
+  def validate_media?
+    super || (managed && bootdisk_build? && build?)
   end
 
-  def can_be_built_with_bootdisk?
-    can_be_built_without_bootdisk? || (managed? and SETTINGS[:unattended] and bootdisk_build? and !build?)
+  def can_be_built?
+    super || (managed? and SETTINGS[:unattended] and bootdisk_build? and !build?)
   end
 end

data/app/models/setting/bootdisk.rb

@@ -1,6 +1,6 @@
 class Setting::Bootdisk< ::Setting
   def self.load_defaults
-    return unless ActiveRecord::Base.connection.table_exists?('settings')
+    return unless ApplicationRecord.connection.table_exists?('settings')
     return unless super
 
     ipxe = ['/usr/lib/ipxe'].find { |p| File.exist?(p) } || '/usr/share/ipxe'

data/app/services/foreman_bootdisk/iso_generator.rb

@@ -11,7 +11,10 @@ class ForemanBootdisk::ISOGenerator
     raise ::Foreman::Exception.new(N_('Host is not in build mode, so the template cannot be rendered')) unless host.build?
 
     tmpl = host.send(:generate_pxe_template, :PXELinux)
-    raise ::Foreman::Exception.new(N_('Unable to generate disk template: %s'), host.errors.full_messages.to_sentence) if tmpl == false
+    unless tmpl
+      err = host.errors.full_messages.to_sentence
+      raise ::Foreman::Exception.new(N_('Unable to generate disk template, PXELinux template not found or: %s'), err)
+    end
 
     # pxe_files and filename conversion is utterly bizarre
     # aim to convert filenames to something usable under ISO 9660, update the template to match

data/app/services/foreman_bootdisk/renderer.rb

@@ -13,9 +13,9 @@ module ForemanBootdisk
       if subnet.present?
         # rendering a subnet-level bootdisk requires tricking the renderer into thinking it has a
         # valid host, with a token, and with a tftp proxy
-        @host = Struct.new(:token, :subnet).new(
+        @host = Struct.new(:token, :provision_interface).new(
           Struct.new(:value).new('faketoken'),
-          subnet
+          Struct.new(:subnet).new(subnet)
         )
       else
         @host = Struct.new(:token, :subnet).new(nil,nil)

data/app/services/foreman_bootdisk/renderer_methods.rb

@@ -10,14 +10,18 @@ module ForemanBootdisk
         u.fragment = nil
         u.to_s
       end
+
+      def bootdisk_raise(*args)
+        raise ::Foreman::Exception.new(*args)
+      end
     end
 
-    def bootdisk_chain_url(mac = '', action = 'iPXE')
+    def bootdisk_chain_url(mac = self.try(:mac), action = 'iPXE')
       self.class.format_bootdisk_chain_url(foreman_url(action), mac)
     end
 
     def bootdisk_raise(*args)
-      raise ::Foreman::Exception.new(*args)
+      self.class.bootdisk_raise(*args)
     end
   end
 end

data/db/migrate/20130914211030_create_host_bootdisk_template.rb

@@ -1,4 +1,4 @@
-class CreateHostBootdiskTemplate < ActiveRecord::Migration
+class CreateHostBootdiskTemplate < ActiveRecord::Migration[4.2]
   def self.up
   end
 

data/db/migrate/20130915104500_edit_host_bootdisk_template_multinic.rb

@@ -1,4 +1,4 @@
-class EditHostBootdiskTemplateMultinic < ActiveRecord::Migration
+class EditHostBootdiskTemplateMultinic < ActiveRecord::Migration[4.2]
   def self.up
   end
 

data/db/migrate/20130915133321_create_kickstart_bootdisk_template.rb

@@ -1,4 +1,4 @@
-class CreateKickstartBootdiskTemplate < ActiveRecord::Migration
+class CreateKickstartBootdiskTemplate < ActiveRecord::Migration[4.2]
   def self.up
   end
 

data/db/migrate/20130915201457_create_generic_host_bootdisk_template.rb

@@ -1,4 +1,4 @@
-class CreateGenericHostBootdiskTemplate < ActiveRecord::Migration
+class CreateGenericHostBootdiskTemplate < ActiveRecord::Migration[4.2]
   def self.up
   end
 

data/db/migrate/20131021095100_edit_host_bootdisk_template_dns_secondary.rb

@@ -1,4 +1,4 @@
-class EditHostBootdiskTemplateDnsSecondary < ActiveRecord::Migration
+class EditHostBootdiskTemplateDnsSecondary < ActiveRecord::Migration[4.2]
   def self.up
   end
 

data/db/migrate/20140522185700_change_templatekind_to_bootdisk.rb

@@ -1,5 +1,5 @@
-class ChangeTemplatekindToBootdisk < ActiveRecord::Migration
-  class FakeConfigTemplate < ActiveRecord::Base
+class ChangeTemplatekindToBootdisk < ActiveRecord::Migration[4.2]
+  class FakeConfigTemplate < ApplicationRecord
     if ActiveRecord::Migrator.get_all_versions.include?(20150514072626)
       self.table_name = 'templates'
     else

data/db/migrate/20171009225200_remove_duplicate_bootdisk_templates.rb

@@ -1,4 +1,4 @@
-class RemoveDuplicateBootdiskTemplates < ActiveRecord::Migration
+class RemoveDuplicateBootdiskTemplates < ActiveRecord::Migration[4.2]
   def up
     template_names = ['Boot disk iPXE - host', 'Boot disk iPXE - generic host']
     template_names.each do |template_name|

data/lib/foreman_bootdisk/engine.rb

@@ -48,7 +48,7 @@ module ForemanBootdisk
 
     initializer 'foreman_bootdisk.register_plugin', :before => :finisher_hook do |app|
       Foreman::Plugin.register :foreman_bootdisk do
-        requires_foreman '>= 1.15'
+        requires_foreman '>= 1.18'
 
         security_block :bootdisk do |map|
           permission :download_bootdisk, {:'foreman_bootdisk/disks' => [:generic, :host, :full_host, :subnet, :help],
@@ -76,11 +76,11 @@ module ForemanBootdisk
 
     config.to_prepare do
       begin
-        Host::Managed.send(:include, ForemanBootdisk::HostExt)
+        Host::Managed.send(:prepend, ForemanBootdisk::HostExt)
+        Host::Managed.send(:include, ForemanBootdisk::RendererMethods)
         Host::Managed.send(:include, ForemanBootdisk::Orchestration::Compute) if SETTINGS[:unattended]
-        HostsHelper.send(:include, ForemanBootdisk::HostsHelperExt)
-        UnattendedController.send(:include, ForemanBootdisk::UnattendedControllerExt)
-        Foreman::Model::Vmware.send(:include, ForemanBootdisk::ComputeResources::Vmware) if Foreman::Model::Vmware.available?
+        HostsHelper.send(:prepend, ForemanBootdisk::HostsHelperExt)
+        Foreman::Model::Vmware.send(:prepend, ForemanBootdisk::ComputeResources::Vmware) if Foreman::Model::Vmware.available?
       rescue => e
         puts "#{ForemanBootdisk::ENGINE_NAME}: skipping engine hook (#{e.to_s})"
       end

data/lib/foreman_bootdisk/version.rb

@@ -1,3 +1,3 @@
 module ForemanBootdisk
-  VERSION = '10.0.2'
+  VERSION = '12.0.0'
 end

data/locale/foreman_bootdisk.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_bootdisk 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-01 14:36-0500\n"
-"PO-Revision-Date: 2017-12-01 14:36-0500\n"
+"POT-Creation-Date: 2018-03-12 12:56-0400\n"
+"PO-Revision-Date: 2018-03-12 12:56-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -289,14 +289,6 @@ msgstr ""
 msgid "Host has no domain defined"
 msgstr ""
 
-#: ../app/views/foreman_bootdisk/host.erb:13
-msgid "Subnet (%s) has no gateway defined"
-msgstr ""
-
-#: ../app/views/foreman_bootdisk/host.erb:14
-msgid "Subnet (%s) has no primary DNS server defined"
-msgstr ""
-
 #: ../lib/foreman_bootdisk/engine.rb:65
 msgid "Boot disk based"
 msgstr ""

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

@@ -7,7 +7,7 @@ class ForemanBootdisk::Api::V2::DisksControllerTest < ActionController::TestCase
   test "should generate generic image" do
     ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/disk generic host template/))).yields("temp ISO")
     @controller.expects(:read_file).with("temp ISO").returns("ISO image")
-    get :generic, {}
+    get :generic
     assert_response :success
     assert_equal "ISO image", @response.body
   end
@@ -19,7 +19,7 @@ class ForemanBootdisk::Api::V2::DisksControllerTest < ActionController::TestCase
     test "should generate host image" do
       ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/disk host template/))).yields("temp ISO")
       @controller.expects(:read_file).with("temp ISO").returns("ISO image")
-      get :host, {:id => @host.name}
+      get :host, params: {:id => @host.name}
       assert_response :success
       assert_equal "ISO image", @response.body
     end
@@ -27,7 +27,7 @@ class ForemanBootdisk::Api::V2::DisksControllerTest < ActionController::TestCase
     test "should generate full host image" do
       ForemanBootdisk::ISOGenerator.expects(:generate_full_host).with(@host).yields("temp ISO")
       @controller.expects(:read_file).with("temp ISO").returns("ISO image")
-      get :host, {:id => @host.name, :full => true}
+      get :host, params: {:id => @host.name, :full => true}
       assert_response :success
       assert_equal "ISO image", @response.body
     end

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

@@ -14,7 +14,7 @@ class ForemanBootdisk::Api::V2::SubnetDisksControllerTest < ActionController::Te
       ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/disk generic host template/))).yields("temp ISO")
       ForemanBootdisk::Renderer.any_instance.stubs(:bootdisk_chain_url).yields("http://smart-proxy.lan")
       File.expects(:read).with("temp ISO").returns("ISO image")
-      get :subnet, {:id => @host.subnet.id}
+      get :subnet, params: {:id => @host.subnet.id}
       assert_response :success
       assert_equal "ISO image", @response.body
     end

data/test/functional/foreman_bootdisk/disks_controller_test.rb

@@ -7,7 +7,7 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
   test "should generate generic image" do
     ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/disk generic host template/))).yields("temp ISO")
     @controller.expects(:read_file).with("temp ISO").returns("ISO image")
-    get :generic, {}, set_session_user
+    get :generic, session: set_session_user
     assert_response :success
     assert_equal "ISO image", @response.body
   end
@@ -21,7 +21,7 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
     test "should generate host image" do
       ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/disk host template/))).yields("temp ISO")
       @controller.expects(:read_file).with("temp ISO").returns("ISO image")
-      get :host, {:id => @host.name}, set_session_user
+      get :host, params: {:id => @host.name}, session: set_session_user
       assert_response :success
       assert_equal "ISO image", @response.body
     end
@@ -29,7 +29,7 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
     test "should generate full host image" do
       ForemanBootdisk::ISOGenerator.expects(:generate_full_host).with(@host).yields("temp ISO")
       @controller.expects(:read_file).with("temp ISO").returns("ISO image")
-      get :full_host, {:id => @host.name}, set_session_user
+      get :full_host, params: {:id => @host.name}, session: set_session_user
       assert_response :success
       assert_equal "ISO image", @response.body
     end
@@ -38,7 +38,7 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
       ForemanBootdisk::ISOGenerator.expects(:generate).with(has_entry(:ipxe => regexp_matches(/disk generic host template/))).yields("temp ISO")
       ForemanBootdisk::Renderer.any_instance.stubs(:bootdisk_chain_url).yields("http://smart-proxy.lan")
       @controller.expects(:read_file).with("temp ISO").returns("ISO image")
-      get :subnet, {:id => @host.name}, set_session_user
+      get :subnet, params: {:id => @host.name}, session: set_session_user
       assert_empty flash[:error]
       assert_response :success
       assert_equal "ISO image", @response.body
@@ -52,14 +52,14 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
     setup :setup_host
 
     test "should not generate subnet image" do
-      get :subnet, {:id => @host.name}, set_session_user
+      get :subnet, params: {:id => @host.name}, session: set_session_user
       assert_match(/Failed.*: TFTP feature not enabled/, flash[:error])
       assert_response :redirect
     end
   end
 
   test "should render help" do
-    get :help, {}, set_session_user
+    get :help, session: set_session_user
     assert_response :success
   end
 end

data/test/unit/iso_generator_test.rb

@@ -40,10 +40,9 @@ class ForemanBootdisk::IsoGeneratorTest < ActiveSupport::TestCase
   end
 
   test "full host image generation generates via PXELinux type" do
+    @host.expects(:generate_pxe_template).with(:PXELinux).returns("Template")
     @host.operatingsystem.expects(:pxe_files).returns([])
-    @host.operatingsystem.expects(:kernel).returns("kernel")
-    @host.operatingsystem.expects(:initrd).returns("initrd")
-    ForemanBootdisk::ISOGenerator.expects(:generate).with({:isolinux => nil, :files => []}, anything)
+    ForemanBootdisk::ISOGenerator.expects(:generate).with({:isolinux => "Template", :files => []}, anything)
     ForemanBootdisk::ISOGenerator.generate_full_host(@host)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 10.0.2
+  version: 12.0.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-05-29 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.
@@ -25,7 +25,6 @@ files:
 - LICENSE
 - README.md
 - app/assets/javascripts/foreman_bootdisk/host_edit.js
-- app/controllers/concerns/foreman_bootdisk/unattended_controller_ext.rb
 - app/controllers/foreman_bootdisk/api/v2/disks_controller.rb
 - app/controllers/foreman_bootdisk/api/v2/subnet_disks_controller.rb
 - app/controllers/foreman_bootdisk/disks_controller.rb
@@ -116,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman

data/app/controllers/concerns/foreman_bootdisk/unattended_controller_ext.rb

@@ -1,12 +0,0 @@
-module ForemanBootdisk::UnattendedControllerExt
-  extend ActiveSupport::Concern
-
-  included do
-    alias_method_chain :find_host_by_ip_or_mac, :param_mac
-  end
-
-  def find_host_by_ip_or_mac_with_param_mac
-    request.env['HTTP_X_RHN_PROVISIONING_MAC_0'] = "unknown #{params['mac']}" unless request.env.has_key?('HTTP_X_RHN_PROVISIONING_MAC_0') || params['mac'].nil?
-    find_host_by_ip_or_mac_without_param_mac
-  end
-end