foreman_bootdisk 15.0.0 → 17.1.0

data/locale/zh_CN/foreman_bootdisk.po

@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 17.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-04-18 20:22+0000\n"
-"Last-Translator: Lukáš Zapletal\n"
+"PO-Revision-Date: 2019-10-22 20:06+0000\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/langu"
 "age/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,9 @@ 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 引导装载程序的主机映像变体。如果某个硬件中的链载入失败，这个变体可能会有帮助，但缺点是必须为所有 OS、引导装载程序或 PXELinux 模板中的所有更改重新生成该映像。"
 
+msgid "Action with sub plans"
+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盘。"
 
@@ -44,9 +47,18 @@ msgstr "引导磁盘内嵌的模板"
 msgid "Boot disks"
 msgstr "引导磁盘"
 
+msgid "Both IP and Subnet must be set"
+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 "下载通用映像"
 
@@ -56,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}"
 
@@ -77,6 +101,9 @@ msgstr "完整主机映像"
 msgid "Generating ISO image for %s"
 msgstr "为 %s 生成 ISO 映像"
 
+msgid "Generic Grub2 EFI image template"
+msgstr ""
+
 msgid "Generic image"
 msgstr "原始映像"
 
@@ -86,14 +113,23 @@ 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 "帮助"
 
 msgid "Host '%s' image"
 msgstr "主机 '%s' 映像"
 
-msgid "Host has no IP address defined"
-msgstr "没有为主机定义 IP 地址"
+msgid "Host bootdisk does not work with static IPv6"
+msgstr ""
+
+msgid "Host has no IPv4 or IPv6 address defined"
+msgstr ""
 
 msgid "Host has no domain defined"
 msgstr "没有为主机定义域"
@@ -119,12 +155,18 @@ 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 目录"
 
+msgid "Import Puppet classes"
+msgstr "导入 Puppet 类"
+
+msgid "Import facts"
+msgstr "导入 fact"
+
 msgid "Installation media caching"
 msgstr "安装介质缓存"
 
@@ -134,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 映像目录的路径"
 
@@ -155,6 +200,9 @@ msgstr "请确保已安装 isolinux/syslinux 软件包。"
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr "为 Foreman 生成基于 iPXE 的引导磁盘的插件，在不需要 PXE 架构的条件下即可供应主机。"
 
+msgid "Remote action:"
+msgstr "远程操作："
+
 msgid "SYSLINUX directory"
 msgstr "SYSLINUX 目录"
 
@@ -188,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,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 14.0.0\n"
+"Project-Id-Version: foreman_bootdisk 17.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2019-04-18 20:22+0000\n"
-"Last-Translator: Lukáš Zapletal\n"
+"PO-Revision-Date: 2019-10-22 20:06+0000\n"
+"Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/lang"
 "uage/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,9 @@ 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 範本進行任何更改，映像檔就必須重新產生。"
 
+msgid "Action with sub plans"
+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 磁碟中。"
 
@@ -44,9 +47,18 @@ msgstr ""
 msgid "Boot disks"
 msgstr "開機磁碟"
 
+msgid "Both IP and Subnet must be set"
+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 "下載泛型映像檔"
 
@@ -56,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 ""
 
@@ -77,6 +101,9 @@ msgstr "完整的主機映像檔"
 msgid "Generating ISO image for %s"
 msgstr ""
 
+msgid "Generic Grub2 EFI image template"
+msgstr ""
+
 msgid "Generic image"
 msgstr "泛型映像檔"
 
@@ -86,14 +113,23 @@ 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 "協助"
 
 msgid "Host '%s' image"
 msgstr "主機「%s」映像檔"
 
-msgid "Host has no IP address defined"
-msgstr "主機尚未定義 IP 位址"
+msgid "Host bootdisk does not work with static IPv6"
+msgstr ""
+
+msgid "Host has no IPv4 or IPv6 address defined"
+msgstr ""
 
 msgid "Host has no domain defined"
 msgstr "主機尚未定義區域"
@@ -119,12 +155,18 @@ 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 ""
 
+msgid "Import Puppet classes"
+msgstr "匯入 Puppet 類別"
+
+msgid "Import facts"
+msgstr "匯入詳情"
+
 msgid "Installation media caching"
 msgstr ""
 
@@ -134,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 映像檔的目錄之路徑"
 
@@ -155,6 +200,9 @@ msgstr ""
 msgid "Plugin for Foreman that creates iPXE-based boot disks to provision hosts without the need for PXE infrastructure."
 msgstr "能建立基於 iPXE 的開機磁碟的 Foreman 外掛程式，以在不需要 PXE 設備的情況下佈建主機。"
 
+msgid "Remote action:"
+msgstr "遠端動作："
+
 msgid "SYSLINUX directory"
 msgstr ""
 
@@ -188,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/release-gem

@@ -1,4 +1,6 @@
 #!/bin/env ruby
+# frozen_string_literal: true
+# rubocop:disable all
 
 $plugin_name = "foreman_bootdisk"
 RUBY_VERSION_FILE = "lib/#{$plugin_name}/version.rb"

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