foreman_bootdisk 16.1.0 → 18.1.0

data/locale/zh_TW/foreman_bootdisk.po

@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 16.1.0\n"
+"Project-Id-Version: foreman_bootdisk 18.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-10-22 20:06+0000\n"
-"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
+"PO-Revision-Date: 2021-09-24 07:25+0000\n"
+"Last-Translator: Transifex Bot <>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/lang"
 "uage/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,9 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+msgid "* - These bootdisk types were disabled, you can enable them in Administer - Settings."
+msgstr ""
+
 msgid "A variant of the per-host image which contains the OS bootloader embedded inside the disk.  This may be useful if chainloading fails on certain hardware, but has the downside that the image must be regenerated for any change in the OS, bootloader or PXELinux templates."
 msgstr "個別主機映像檔的變體，磁碟中嵌入了 OS 的開機載入程式。這對於在特定硬體上的 chainloading 失敗時特別有幫助，不過缺點就是若要對 OS、開機載入程式或 PXELinux 範本進行任何更改，映像檔就必須重新產生。"
 
@@ -26,6 +29,9 @@ msgstr "有子計畫的動作"
 msgid "All images are usable as either ISOs or as disk images, including being written to a USB disk with `dd`."
 msgstr "所有映像檔皆能作為 ISO 或是磁碟映像檔使用，包括以 `dd` 寫入一個 USB 磁碟中。"
 
+msgid "Allowed bootdisk types"
+msgstr ""
+
 msgid "Attach ISO image to CDROM drive for %s"
 msgstr ""
 
@@ -35,6 +41,9 @@ msgstr "上一步"
 msgid "Boot disk"
 msgstr "開機磁碟"
 
+msgid "Boot disk Help"
+msgstr ""
+
 msgid "Boot disk based"
 msgstr ""
 
@@ -53,6 +62,12 @@ msgstr ""
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr "請使用 genisoimage 或是 mkisofs 來作為產生 ISO 映像檔的指令"
 
+msgid "Creating new image failed, install truncate utility"
+msgstr ""
+
+msgid "Detach ISO image from CDROM drive for %s"
+msgstr ""
+
 msgid "Download generic image"
 msgstr "下載泛型映像檔"
 
@@ -62,9 +77,21 @@ msgstr "下載主機映像檔"
 msgid "Download subnet generic image"
 msgstr "下載子網路泛型映像檔"
 
+msgid "Ensure %{file} is readable (or update \"Grub2 directory\" setting)"
+msgstr ""
+
 msgid "Failed to attach ISO image to CDROM drive of instance %{name}: %{message}"
 msgstr ""
 
+msgid "Failed to create a directory within the ESP image"
+msgstr ""
+
+msgid "Failed to detach ISO image from CDROM drive of instance %{name}: %{message}"
+msgstr ""
+
+msgid "Failed to format the ESP image via mkfs.msdos"
+msgstr ""
+
 msgid "Failed to generate ISO image for instance %{name}: %{message}"
 msgstr ""
 
@@ -83,17 +110,26 @@ msgstr "完整的主機映像檔"
 msgid "Generating ISO image for %s"
 msgstr ""
 
+msgid "Generic Grub2 EFI image template"
+msgstr ""
+
 msgid "Generic image"
 msgstr "泛型映像檔"
 
 msgid "Generic image template"
 msgstr ""
 
+msgid "Generic images"
+msgstr ""
+
 msgid "Generic images are a reusable disk image that works for any host registered in Foreman.  It requires a basic DHCP and DNS service to function and contact the server, but does not require DHCP reservations or static IP addresses."
 msgstr "泛型映像檔是個可重複使用的磁碟映像檔，並且可使用於任何向 Foreman 註冊過的主機上。它需要一項基本的 DHCP 和 DNS 服務才能運作和聯絡伺服器，不過並不需要 DHCP 預留或靜態 IP 位址。"
 
-msgid "Help"
-msgstr "協助"
+msgid "Grub2 directory"
+msgstr ""
+
+msgid "Grub2 template to use for generic EFI host boot disks"
+msgstr ""
 
 msgid "Host '%s' image"
 msgstr "主機「%s」映像檔"
@@ -119,17 +155,26 @@ msgstr "主機映像檔"
 msgid "Host image template"
 msgstr ""
 
+msgid "Host images"
+msgstr ""
+
+msgid "Host is not in build mode"
+msgstr ""
+
 msgid "Host is not in build mode, so the template cannot be rendered"
 msgstr "主機不在組建模式下，因此無法編寫範本"
 
+msgid "Host is not in build mode."
+msgstr ""
+
 msgid "ISO build failed"
 msgstr "建立 ISO 失敗"
 
 msgid "ISO generation command"
 msgstr ""
 
-msgid "ISO hybrid conversion failed"
-msgstr "ISO 混合式轉換失敗"
+msgid "ISO hybrid conversion failed: %s"
+msgstr ""
 
 msgid "ISOLINUX directory"
 msgstr ""
@@ -146,9 +191,15 @@ msgstr ""
 msgid "Installation media files will be cached for full host images"
 msgstr "安裝媒介檔案將會被快取以作為完整的主機映像檔"
 
+msgid "List of allowed bootdisk types, remove type to disable it"
+msgstr ""
+
 msgid "Once chainloaded, the OS bootloader and installer are downloaded directly from the installation media configured in Foreman, and the provisioning script (kickstart/preseed) is downloaded from Foreman."
 msgstr "在 chainload 之後，OS 開機載入程式和安裝程式將會直接從 Foreman 中所配置的安裝媒介下載，而佈建 script（kickstart/preseed）則會由 Foreman 下載。"
 
+msgid "Path to directory containing grubx64.efi and shimx64.efi"
+msgstr ""
+
 msgid "Path to directory containing iPXE images"
 msgstr "包含 iPXE 映像檔的目錄之路徑"
 
@@ -182,34 +233,46 @@ msgstr "子網路「%s」泛型映像檔"
 msgid "Subnet boot disks"
 msgstr "子網路開機磁碟"
 
+msgid "Subnet generic image"
+msgstr ""
+
 msgid "Subnet image"
 msgstr "子網路映像檔"
 
 msgid "Subnet images are similar to generic images, but chain-loading is done via the TFTP Smart Proxy assigned to the Subnet of the host. The smart proxy must have the \"Templates\" module enabled and configured."
 msgstr "子網路映像檔跟泛型映像檔類似，但連鎖載入（chain-loading）是透過 TFTP 智慧型代理指定至主機的子網路。智慧型代理必須啟用並配置了「模版」（Templates）模組。"
 
-msgid "Subnet is not assigned to the host %s"
-msgstr "子網路並未指定給主機 %s"
-
 msgid "TFTP feature not enabled for subnet %s"
 msgstr "TFTP 功能並未啟動給子網路 %s 使用"
 
 msgid "The OS install continues using the installation media configured in Foreman, and it will typically configure static networking, depending on how the OS iPXE template is configured."
 msgstr "OS 安裝程序會繼續使用配置於 Foreman 中的安裝媒介，並且它一般會根據 OS iPXE 範本的配置方法來配置靜態網路。"
 
+msgid "These images are more generic than previous images. You can find them at subnet index page."
+msgstr ""
+
+msgid "These images are used for host. You can find them at host detail page."
+msgstr ""
+
 msgid "This image is generic for all hosts with a provisioning NIC on that subnet."
 msgstr "這映像檔對在該子網路上配有網路卡的所有主機來說，是通用的。"
 
+msgid "This type of bootdisk is not allowed. Please contact administrator."
+msgstr ""
+
 msgid "True for full, false for basic reusable image"
 msgstr "「true」代表完整，「false」則代表可重複使用的基本映像檔"
 
 msgid "Unable to find template specified by %s setting"
 msgstr "找不到 %s 設定所指定的範本"
 
-msgid "Unable to generate disk PXELinux template: %s"
+msgid "Unable to generate disk %{kind} template: %{error}"
+msgstr ""
+
+msgid "Unable to generate disk template, %{kind} template not found."
 msgstr ""
 
-msgid "Unable to generate disk template, PXELinux template not found."
+msgid "Unable to mcopy %{file}"
 msgstr ""
 
 msgid "Upload ISO image to datastore for %s"

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

@@ -5,33 +5,67 @@ require 'test_plugin_helper'
 class ForemanBootdisk::Api::V2::DisksControllerTest < ActionController::TestCase
   include ForemanBootdiskTestHelper
   setup :setup_bootdisk
+  setup :setup_referer
+  setup :setup_org_loc
 
-  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')
+  def perform_generic_generate
+    tmp = create_tempfile
+    ForemanBootdisk::ISOGenerator.expects(:generate).yields(create_tempfile.path)
     get :generic
     assert_response :success
-    assert_equal 'ISO image', @response.body
+  ensure
+    tmp.unlink
   end
 
-  describe '#host' do
-    setup :setup_referer
-    setup :setup_host_env
+  def perform_host_generate
+    tmp = create_tempfile
+    ForemanBootdisk::ISOGenerator.expects(:generate).yields(create_tempfile.path)
+    get :host, params: { id: @host.name }
+    assert_response :success
+  ensure
+    tmp.unlink
+  end
+
+  def perform_full_host_generate
+    tmp = create_tempfile
+    ForemanBootdisk::ISOGenerator.expects(:generate_full_host).yields(create_tempfile.path)
+    get :host, params: { id: @host.name, full: true }
+    assert_response :success
+  ensure
+    tmp.unlink
+  end
+
+  describe '#generic with TFTP' do
+    setup :setup_subnet_with_tftp
+    setup :setup_host
+
+    test 'should generate generic image' do
+      perform_generic_generate
+    end
+
+    test 'should generate host image' do
+      perform_host_generate
+    end
+
+    test 'should generate full host image' do
+      perform_full_host_generate
+    end
+  end
+
+  describe '#subnet_host with TFTP and HTTPBOOT' do
+    setup :setup_subnet_with_tftp_httpboot_template
+    setup :setup_host
+
+    test 'should generate generic image' do
+      perform_generic_generate
+    end
 
     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, params: { id: @host.name }
-      assert_response :success
-      assert_equal 'ISO image', @response.body
+      perform_host_generate
     end
 
     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, params: { id: @host.name, full: true }
-      assert_response :success
-      assert_equal 'ISO image', @response.body
+      perform_full_host_generate
     end
   end
 

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

@@ -5,20 +5,33 @@ require 'test_plugin_helper'
 class ForemanBootdisk::Api::V2::SubnetDisksControllerTest < ActionController::TestCase
   include ForemanBootdiskTestHelper
   setup :setup_bootdisk
+  setup :setup_referer
+  setup :setup_org_loc
 
-  describe '#subnet_host' do
-    setup :setup_referer
-    setup :setup_org_loc
-    setup :setup_subnet
+  def perform_subnet_generate
+    tmp = create_tempfile
+    ForemanBootdisk::ISOGenerator.expects(:generate).yields(create_tempfile.path)
+    get :subnet, params: { id: @host.subnet.id }
+    assert_response :success
+  ensure
+    tmp.unlink
+  end
+
+  describe '#subnet_host with TFTP' do
+    setup :setup_subnet_with_tftp
+    setup :setup_host
+
+    test 'should generate subnet generic host image' do
+      perform_subnet_generate
+    end
+  end
+
+  describe '#subnet_host with TFTP and HTTPBOOT' do
+    setup :setup_subnet_with_tftp_httpboot_template
     setup :setup_host
 
     test 'should generate subnet generic host image' do
-      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, params: { id: @host.subnet.id }
-      assert_response :success
-      assert_equal 'ISO image', @response.body
+      perform_subnet_generate
     end
   end
 end

data/test/functional/foreman_bootdisk/disks_controller_test.rb

@@ -5,45 +5,67 @@ require 'test_plugin_helper'
 class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
   include ForemanBootdiskTestHelper
   setup :setup_bootdisk
+  setup :setup_referer
+  setup :setup_org_loc
 
-  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')
+  def perform_generic_generate
+    tmp = create_tempfile
+    ForemanBootdisk::ISOGenerator.expects(:generate).yields(create_tempfile.path)
     get :generic, session: set_session_user
     assert_response :success
-    assert_equal 'ISO image', @response.body
+  ensure
+    tmp.unlink
   end
 
-  describe '#host' do
-    setup :setup_referer
-    setup :setup_org_loc
-    setup :setup_subnet
+  def perform_host_generate
+    tmp = create_tempfile
+    ForemanBootdisk::ISOGenerator.expects(:generate).yields(create_tempfile.path)
+    get :host, params: { id: @host.name }, session: set_session_user
+    assert_response :success
+  ensure
+    tmp.unlink
+  end
+
+  def perform_full_host_generate
+    tmp = create_tempfile
+    ForemanBootdisk::ISOGenerator.expects(:generate_full_host).yields(create_tempfile.path)
+    get :full_host, params: { id: @host.name }, session: set_session_user
+    assert_response :success
+  ensure
+    tmp.unlink
+  end
+
+  describe '#generic with TFTP' do
+    setup :setup_subnet_with_tftp
     setup :setup_host
 
+    test 'should generate generic image' do
+      perform_generic_generate
+    end
+
     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, params: { id: @host.name }, session: set_session_user
-      assert_response :success
-      assert_equal 'ISO image', @response.body
+      perform_host_generate
     end
 
     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, params: { id: @host.name }, session: set_session_user
-      assert_response :success
-      assert_equal 'ISO image', @response.body
+      perform_full_host_generate
     end
+  end
 
-    test 'should generate subnet image' do
-      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, params: { id: @host.name }, session: set_session_user
-      assert_empty flash[:error]
-      assert_response :success
-      assert_equal 'ISO image', @response.body
+  describe '#subnet_host with TFTP and HTTPBOOT' do
+    setup :setup_subnet_with_tftp_httpboot_template
+    setup :setup_host
+
+    test 'should generate generic image' do
+      perform_generic_generate
+    end
+
+    test 'should generate host image' do
+      perform_host_generate
+    end
+
+    test 'should generate full host image' do
+      perform_full_host_generate
     end
   end
 
@@ -53,10 +75,18 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
     setup :setup_subnet_no_tftp
     setup :setup_host
 
-    test 'should not generate subnet image' do
-      get :subnet, params: { id: @host.name }, session: set_session_user
-      assert_match(/Failed.*: TFTP feature not enabled/, flash[:error])
-      assert_response :redirect
+    test 'should prolong token for host image' do
+      Setting[:token_duration] = 60
+      @host.set_token
+      past = Time.now
+      assert @host.token.expires > past
+      travel_to(past + 2.hours)
+      assert @host.token_expired?
+
+      perform_full_host_generate
+
+      assert_equal @host.token_expired?, true
+      assert @host.token.expires > past
     end
   end
 

data/test/functional/foreman_bootdisk/subnet_disks_controller_test.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+class ForemanBootdisk::SubnetDisksControllerTest < ActionController::TestCase
+  include ForemanBootdiskTestHelper
+  setup :setup_bootdisk
+  setup :setup_referer
+  setup :setup_org_loc
+
+  def perform_subnet_generate
+    tmp = create_tempfile
+    ForemanBootdisk::ISOGenerator.expects(:generate).yields(create_tempfile.path)
+    get :subnet, params: { id: @subnet.id }, session: set_session_user
+    assert_empty flash[:error]
+    assert_response :success
+  ensure
+    tmp.unlink
+  end
+
+  describe '#generic with TFTP' do
+    setup :setup_subnet_with_tftp
+    setup :setup_host
+
+    test 'should generate subnet image' do
+      perform_subnet_generate
+    end
+  end
+
+  describe '#subnet_host with TFTP and HTTPBOOT' do
+    setup :setup_subnet_with_tftp_httpboot_template
+    setup :setup_host
+
+    test 'should generate subnet image' do
+      perform_subnet_generate
+    end
+  end
+
+  describe '#host without tftp' do
+    setup :setup_referer
+    setup :setup_org_loc
+    setup :setup_subnet_no_tftp
+    setup :setup_host
+
+    test 'should not generate subnet image' do
+      get :subnet, params: { id: @subnet.id }, session: set_session_user
+      assert_match(/Failed.*: TFTP feature not enabled/, flash[:error])
+      assert_response :redirect
+    end
+  end
+end

data/test/test_plugin_helper.rb

@@ -5,15 +5,23 @@ require 'webmock/minitest'
 require 'webmock'
 
 module ForemanBootdiskTestHelper
+  def create_tempfile
+    file = Tempfile.new('bootdisk-test', '/tmp')
+    file.close
+    file
+  end
+
   def setup_bootdisk
+    ForemanBootdisk::Scope::Bootdisk.any_instance.stubs(:bootdisk_chain_url).returns('http://smart-proxy.example.com/unattended/iPXE?mac=')
     setup_routes
     setup_settings
     setup_templates
   end
 
+  # TODO remove me
   def setup_host_env
     setup_org_loc
-    setup_subnet
+    setup_subnet_with_tftp
     setup_host
   end
 
@@ -39,7 +47,17 @@ module ForemanBootdiskTestHelper
     @loc = FactoryBot.create(:location)
   end
 
-  def setup_subnet
+  def setup_subnet_with_tftp_httpboot_template
+    ProxyAPI::V2::Features.any_instance.stubs(:features).returns(:httpboot => { :settings => { :https_port => 1234 }, :state => 'running' }, :templates => {}, :tftp => {})
+    SmartProxy.any_instance.stubs(:httpboot_http_port).returns('8888')
+    SmartProxy.any_instance.stubs(:httpboot_https_port).returns('9999')
+
+    proxy = FactoryBot.create(:smart_proxy, features: [FactoryBot.create(:tftp_feature), FactoryBot.create(:feature, :templates), FactoryBot.create(:feature, :httpboot)])
+    proxy.reload
+    setup_subnet_no_tftp.update! tftp: proxy, httpboot: proxy, template: proxy
+  end
+
+  def setup_subnet_with_tftp
     tftp_proxy = FactoryBot.create(:smart_proxy, features: [FactoryBot.create(:tftp_feature)])
     setup_subnet_no_tftp.update! tftp: tftp_proxy
   end
@@ -49,6 +67,6 @@ module ForemanBootdiskTestHelper
   end
 
   def setup_host
-    @host = FactoryBot.create(:host, :managed, subnet: @subnet, ip: @subnet.network.sub(/0$/, '4'), organization: @org, location: @loc)
+    @host = FactoryBot.create(:host, :managed, subnet: @subnet, ip: @subnet.network.sub(/0$/, '4'), organization: @org, location: @loc, build: true)
   end
 end

data/test/unit/concerns/host_test.rb

@@ -36,7 +36,7 @@ module ForemanBootdisk
     test 'host should not have bootdisk' do
       if unattended?
         h = FactoryBot.create(:host)
-        assert_equal false, h.bootdisk?
+        assert_not(h.bootdisk?)
       end
     end
 

data/test/unit/concerns/orchestration/compute_test.rb

@@ -22,29 +22,48 @@ module ForemanBootdisk
       @host.send(:setAttachIsoImage)
     end
 
-    test 'provisioning a host with provision method bootdisk should queue bootdisk tasks' do
+    test 'provisioning a host with provision method bootdisk should detach iso' do
+      @cr.expects(:iso_detach)
+      @host.send(:setDetachIsoImage)
+    end
+
+    test 'provisioning a new host with provision method bootdisk should queue bootdisk tasks' do
       @host.stubs(:compute?).returns(true)
+      @host.stubs(:build?).returns(true)
       @host.send(:queue_bootdisk_compute)
       tasks = @host.queue.all.map(&:name)
       assert_includes tasks, "Generating ISO image for #{@host.name}"
       assert_includes tasks, "Upload ISO image to datastore for #{@host.name}"
       assert_includes tasks, "Attach ISO image to CDROM drive for #{@host.name}"
+      assert_not_includes tasks, "Detach ISO image from CDROM drive for #{@host.name}"
     end
 
-    test 'should rebuild bootdisk' do
-      @host.expects(:bootdisk_generate_iso_image).returns(true)
-      @host.expects(:bootdisk_upload_iso).returns(true)
-      @host.expects(:bootdisk_attach_iso).returns(true)
-      assert @host.rebuild_with_bootdisk
+    test 'rebuilding a host with provision method bootdisk should queue bootdisk tasks' do
+      @host.stubs(:compute?).returns(true)
+      old = stub()
+      old.stubs(:build?).returns(false)
+      @host.stubs(:old).returns(old)
+      @host.stubs(:build?).returns(true)
+      @host.send(:queue_bootdisk_compute)
+      tasks = @host.queue.all.map(&:name)
+      assert_includes tasks, "Generating ISO image for #{@host.name}"
+      assert_includes tasks, "Upload ISO image to datastore for #{@host.name}"
+      assert_includes tasks, "Attach ISO image to CDROM drive for #{@host.name}"
+      assert_not_includes tasks, "Detach ISO image from CDROM drive for #{@host.name}"
     end
 
-    test 'should skip rebuild bootdisk' do
-      host = FactoryBot.build(:host,
-                              compute_resource: @cr)
-      host.expects(:bootdisk_generate_iso_image).never
-      host.expects(:bootdisk_upload_iso).never
-      host.expects(:bootdisk_attach_iso).never
-      assert host.rebuild_with_bootdisk
+    test 'the iso should be detached when the host leaves build mode' do
+      @host.stubs(:compute?).returns(true)
+      old = stub()
+      old.stubs(:build?).returns(true)
+      @host.stubs(:old).returns(old)
+      @host.stubs(:build?).returns(false)
+      @host.send(:queue_bootdisk_compute)
+      tasks = @host.queue.all.map(&:name)
+      assert_not_includes tasks, "Generating ISO image for #{@host.name}"
+      assert_not_includes tasks, "Upload ISO image to datastore for #{@host.name}"
+      assert_not_includes tasks, "Attach ISO image to CDROM drive for #{@host.name}"
+      assert_includes tasks, "Detach ISO image from CDROM drive for #{@host.name}"
     end
   end
 end

data/test/unit/foreman_bootdisk/renderer_test.rb

@@ -21,7 +21,7 @@ module ForemanBootdisk
 
       test 'does not include a host token' do
         rendered_template = renderer.generic_template_render
-        assert_includes rendered_template, 'http://foreman.some.host.fqdn/unattended/iPXE?mac=${net0/mac}'
+        assert_includes rendered_template, 'http://smart-proxy.example.com/unattended/iPXE?mac=${net0/mac}'
         assert_not_includes rendered_template, 'token'
       end
     end

data/test/unit/iso_generator_test.rb

@@ -11,10 +11,12 @@ module ForemanBootdisk
       let(:medium) { FactoryBot.create(:medium, name: 'Red Hat Enterprise Linux Atomic Mirror') }
       let(:operatingsystem) { FactoryBot.create(:ubuntu14_10, :with_archs, :with_ptables, media: [medium]) }
       let(:host) { FactoryBot.create(:host, :managed, operatingsystem: operatingsystem, build: true) }
-      let(:template) { FactoryBot.create(:provisioning_template, template: 'Fake kernel line <%= @kernel %> - <%= @initrd %>') }
+      let(:pxelinux_template) { FactoryBot.create(:provisioning_template, template: 'Fake kernel line <%= @kernel %> - <%= @initrd %>') }
+      let(:pxegrub2_template) { FactoryBot.create(:provisioning_template, template: 'Fake kernel line <%= @kernel %> - <%= @initrd %>') }
 
       setup do
-        host.stubs(:provisioning_template).with(kind: :PXELinux).returns(template)
+        host.stubs(:provisioning_template).with(kind: :PXELinux).returns(pxelinux_template)
+        host.stubs(:provisioning_template).with(kind: :PXEGrub2).returns(pxegrub2_template)
       end
 
       test 'fetch handles redirect' do
@@ -40,11 +42,8 @@ module ForemanBootdisk
         )
         initrd_url = urls[:initrd]
 
-        ForemanBootdisk::ISOGenerator.expects(:generate).with({
-                                                                isolinux: "Fake kernel line #{kernel} - #{initrd}",
-                                                                files: { kernel => kernel_url,
-                                                                         initrd => initrd_url }
-                                                              }, anything)
+        ForemanBootdisk::ISOGenerator.expects(:generate)
+                                     .with({ isolinux: "Fake kernel line #{kernel} - #{initrd}", grub: "Fake kernel line /#{kernel} - /#{initrd}", files: { kernel => kernel_url, initrd => initrd_url } }, anything)
 
         ForemanBootdisk::ISOGenerator.generate_full_host(host)
       end