foreman_bootdisk 16.1.0 → 17.0.2

data/locale/ru/foreman_bootdisk.po

@@ -7,7 +7,7 @@
 # Yulia <yulia.poyarkova@redhat.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 16.1.0\n"
+"Project-Id-Version: foreman_bootdisk 17.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-10-22 20:06+0000\n"
 "Last-Translator: Yulia <yulia.poyarkova@redhat.com>\n"
@@ -57,6 +57,12 @@ msgstr ""
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr "Команда создания ISO-образа. Используйте genisoimage или mkisofs"
 
+msgid "Creating new image failed, install truncate utility"
+msgstr ""
+
+msgid "Detach ISO image from CDROM drive for %s"
+msgstr ""
+
 msgid "Download generic image"
 msgstr "Скачать общий образ"
 
@@ -66,9 +72,21 @@ msgstr "Скачать образ узла"
 msgid "Download subnet generic image"
 msgstr "Загрузить стандартный образ для подсети"
 
+msgid "Ensure %{path} contains grubx64.efi and shimx64.efi: install TFTP module or copy those files into /var/lib/foreman/bootdisk (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 ""
 
@@ -87,6 +105,9 @@ msgstr "Полный образ узла"
 msgid "Generating ISO image for %s"
 msgstr "Создается ISO для %s..."
 
+msgid "Generic Grub2 EFI image template"
+msgstr ""
+
 msgid "Generic image"
 msgstr "Стандартный образ"
 
@@ -96,6 +117,12 @@ 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 "Grub2 directory"
+msgstr ""
+
+msgid "Grub2 template to use for generic EFI host boot disks"
+msgstr ""
+
 msgid "Help"
 msgstr "Справка"
 
@@ -132,8 +159,8 @@ msgstr "Не удалось создать ISO"
 msgid "ISO generation command"
 msgstr ""
 
-msgid "ISO hybrid conversion failed"
-msgstr "Ошибка преобразования гибридного образа"
+msgid "ISO hybrid conversion failed: %s"
+msgstr ""
 
 msgid "ISOLINUX directory"
 msgstr ""
@@ -153,6 +180,9 @@ 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 "После того как загрузчик ОС и установщик скачаны напрямую с установочного носителя, настроенного в Foreman, и скрипт подготовки (kickstart/preseed) скачан из Foreman."
 
+msgid "Path to directory containing grubx64.efi and shimx64.efi"
+msgstr ""
+
 msgid "Path to directory containing iPXE images"
 msgstr "Путь к каталогу с образами iPXE"
 
@@ -210,10 +240,13 @@ msgstr "Истина для полного, ложь для начального
 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 %{path}"
 msgstr ""
 
 msgid "Upload ISO image to datastore for %s"

data/locale/sv_SE/foreman_bootdisk.po

@@ -6,7 +6,7 @@
 # johnny.westerlund <johnny.westerlund@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 16.1.0\n"
+"Project-Id-Version: foreman_bootdisk 17.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2019-10-22 20:06+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
@@ -54,6 +54,12 @@ msgstr ""
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
 msgstr "Kommando för att generera ISO-avbildningar, använd genisoimage eller mkisofs"
 
+msgid "Creating new image failed, install truncate utility"
+msgstr ""
+
+msgid "Detach ISO image from CDROM drive for %s"
+msgstr ""
+
 msgid "Download generic image"
 msgstr "Ladda ner generisk avbildning"
 
@@ -63,9 +69,21 @@ msgstr "Ladda ner värd avbildning"
 msgid "Download subnet generic image"
 msgstr ""
 
+msgid "Ensure %{path} contains grubx64.efi and shimx64.efi: install TFTP module or copy those files into /var/lib/foreman/bootdisk (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 ""
 
@@ -84,6 +102,9 @@ msgstr ""
 msgid "Generating ISO image for %s"
 msgstr ""
 
+msgid "Generic Grub2 EFI image template"
+msgstr ""
+
 msgid "Generic image"
 msgstr "Generell avbildning"
 
@@ -93,6 +114,12 @@ 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 ""
 
+msgid "Grub2 directory"
+msgstr ""
+
+msgid "Grub2 template to use for generic EFI host boot disks"
+msgstr ""
+
 msgid "Help"
 msgstr "Hjälp"
 
@@ -129,8 +156,8 @@ msgstr "ISO-bygget misslyckades"
 msgid "ISO generation command"
 msgstr ""
 
-msgid "ISO hybrid conversion failed"
-msgstr "ISO hybridkonvertering misslyckades"
+msgid "ISO hybrid conversion failed: %s"
+msgstr ""
 
 msgid "ISOLINUX directory"
 msgstr ""
@@ -150,6 +177,9 @@ 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 ""
 
+msgid "Path to directory containing grubx64.efi and shimx64.efi"
+msgstr ""
+
 msgid "Path to directory containing iPXE images"
 msgstr "Sökvägen till ett bibliotek med iPXE-avbildningar"
 
@@ -207,10 +237,13 @@ msgstr ""
 msgid "Unable to find template specified by %s setting"
 msgstr "Går inte att hitta mallen specificerad med inställningen %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 %{path}"
 msgstr ""
 
 msgid "Upload ISO image to datastore for %s"

data/locale/zh_CN/foreman_bootdisk.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 16.1.0\n"
+"Project-Id-Version: foreman_bootdisk 17.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"
@@ -53,6 +53,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 +68,21 @@ msgstr "下载主机映像"
 msgid "Download subnet generic image"
 msgstr "下载子网通用映象"
 
+msgid "Ensure %{path} contains grubx64.efi and shimx64.efi: install TFTP module or copy those files into /var/lib/foreman/bootdisk (Grub2 directory setting)"
+msgstr ""
+
 msgid "Failed to attach ISO image to CDROM drive of instance %{name}: %{message}"
 msgstr "未能成功将 ISO 映像附加到实例 %{name} 的 CDROM 驱动：%{message}"
 
+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 "为实例 %{name} 生成 ISO 映像失败：%{message}"
 
@@ -83,6 +101,9 @@ msgstr "完整主机映像"
 msgid "Generating ISO image for %s"
 msgstr "为 %s 生成 ISO 映像"
 
+msgid "Generic Grub2 EFI image template"
+msgstr ""
+
 msgid "Generic image"
 msgstr "原始映像"
 
@@ -92,6 +113,12 @@ 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 "Grub2 directory"
+msgstr ""
+
+msgid "Grub2 template to use for generic EFI host boot disks"
+msgstr ""
+
 msgid "Help"
 msgstr "帮助"
 
@@ -128,8 +155,8 @@ msgstr "ISO 构建失败"
 msgid "ISO generation command"
 msgstr "ISO 生成命令"
 
-msgid "ISO hybrid conversion failed"
-msgstr "ISO 复合转换失败"
+msgid "ISO hybrid conversion failed: %s"
+msgstr ""
 
 msgid "ISOLINUX directory"
 msgstr "ISOLINUX 目录"
@@ -149,6 +176,9 @@ 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 "链载入后，即可从 Foreman 中配置的安装介质直接下载 OS 引导装载程序和安装程序，并可从 Foreman 中下载供应脚本（kickstart/preseed）。"
 
+msgid "Path to directory containing grubx64.efi and shimx64.efi"
+msgstr ""
+
 msgid "Path to directory containing iPXE images"
 msgstr "包含 iPXE 映像目录的路径"
 
@@ -206,10 +236,13 @@ 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 %{path}"
 msgstr ""
 
 msgid "Upload ISO image to datastore for %s"

data/locale/zh_TW/foreman_bootdisk.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 16.1.0\n"
+"Project-Id-Version: foreman_bootdisk 17.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"
@@ -53,6 +53,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 +68,21 @@ msgstr "下載主機映像檔"
 msgid "Download subnet generic image"
 msgstr "下載子網路泛型映像檔"
 
+msgid "Ensure %{path} contains grubx64.efi and shimx64.efi: install TFTP module or copy those files into /var/lib/foreman/bootdisk (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,6 +101,9 @@ msgstr "完整的主機映像檔"
 msgid "Generating ISO image for %s"
 msgstr ""
 
+msgid "Generic Grub2 EFI image template"
+msgstr ""
+
 msgid "Generic image"
 msgstr "泛型映像檔"
 
@@ -92,6 +113,12 @@ 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 "Grub2 directory"
+msgstr ""
+
+msgid "Grub2 template to use for generic EFI host boot disks"
+msgstr ""
+
 msgid "Help"
 msgstr "協助"
 
@@ -128,8 +155,8 @@ 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 ""
@@ -149,6 +176,9 @@ 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 映像檔的目錄之路徑"
 
@@ -206,10 +236,13 @@ 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 %{path}"
 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