foreman_bootdisk 17.1.0 → 18.0.0

data/locale/zh_CN/foreman_bootdisk.po

@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 17.0.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-06-02 10:27+0000\n"
+"Last-Translator: Amit Upadhye <aupadhye@redhat.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/langu"
 "age/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,24 +17,33 @@ msgstr ""
 "Language: zh_CN\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 引导装载程序的主机映像变体。如果某个硬件中的链载入失败，这个变体可能会有帮助，但缺点是必须为所有 OS、引导装载程序或 PXELinux 模板中的所有更改重新生成该映像。"
+msgstr "单个主机镜像的变体，其磁盘内包含 OS 引导装载程序。当某些硬件上的连锁装载失败之时，这可能有用，但是也存在缺点，即 OS、引导状态程序或 PXELinux 模板发生任何变化时都必须重新生成该镜像。"
 
 msgid "Action with sub plans"
-msgstr "带有子计划的操作"
+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盘。"
+msgstr "所有镜像都可用作 ISO 或磁盘镜像，包括使用 `dd` 写入 USB 磁盘。"
+
+msgid "Allowed bootdisk types"
+msgstr "允许的启动盘类型"
 
 msgid "Attach ISO image to CDROM drive for %s"
-msgstr "将 ISO 映像附加至  %s 的 CDROM 驱动"
+msgstr "为 %s 将 ISO 镜像附加至 CDROM 驱动"
 
 msgid "Back"
-msgstr "后退"
+msgstr "返回"
 
 msgid "Boot disk"
 msgstr "引导磁盘"
 
+msgid "Boot disk Help"
+msgstr "引导磁盘帮助"
+
 msgid "Boot disk based"
 msgstr "基于引导磁盘"
 
@@ -45,109 +54,118 @@ msgid "Boot disk embedded template"
 msgstr "引导磁盘内嵌的模板"
 
 msgid "Boot disks"
-msgstr "引导磁盘"
+msgstr "引导盘"
 
 msgid "Both IP and Subnet must be set"
-msgstr ""
+msgstr "必须设置 IP 和子网"
 
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
-msgstr "使用 genisoimage 或者 mkisofs 命令生成 ISO 映像。"
+msgstr "创建 ISO 镜像的命令，使用 genisoimage 或 mkisofs"
 
 msgid "Creating new image failed, install truncate utility"
-msgstr ""
+msgstr "创建新镜像失败，安装截断实用程序"
 
 msgid "Detach ISO image from CDROM drive for %s"
-msgstr ""
+msgstr "为 %s 从 CDROM 驱动取消附加 ISO 镜像"
 
 msgid "Download generic image"
-msgstr "下载通用映像"
+msgstr "下载通用镜像"
 
 msgid "Download host image"
-msgstr "下载主机映像"
+msgstr "下载主机镜像"
 
 msgid "Download subnet generic image"
-msgstr "下载子网通用映象"
+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 "Ensure %{file} is readable (or update \"Grub2 directory\" setting)"
+msgstr "确保 %{file} 是可读的（或更新 \"Grub2 directory\" 设置）"
 
 msgid "Failed to attach ISO image to CDROM drive of instance %{name}: %{message}"
-msgstr "未能成功将 ISO 映像附加到实例 %{name} 的 CDROM 驱动：%{message}"
+msgstr "将 ISO 镜像附加到实例 %{name} 的 CDROM 驱动失败：%{message}"
 
 msgid "Failed to create a directory within the ESP image"
-msgstr ""
+msgstr "无法在 ESP 镜像中创建目录"
 
 msgid "Failed to detach ISO image from CDROM drive of instance %{name}: %{message}"
-msgstr ""
+msgstr "未能成功将 ISO 镜像从实例 %{name} 的 CDROM 驱动中断开：%{message}"
 
 msgid "Failed to format the ESP image via mkfs.msdos"
-msgstr ""
+msgstr "无法通过 mkfs.msdos 格式化 ESP 镜像"
 
 msgid "Failed to generate ISO image for instance %{name}: %{message}"
-msgstr "为实例 %{name} 生成 ISO 映像失败：%{message}"
+msgstr "为实例 %{name} 生成 ISO 镜像：%{message}"
 
 msgid "Failed to render boot disk template"
-msgstr "呈现引导盘模板失败"
+msgstr "未能提供引导磁盘模板"
 
 msgid "Failed to upload ISO image for instance %{name}: %{message}"
-msgstr "为实例 %{name} 上传 ISO 映像失败：%{message}"
+msgstr "为实例 %{name} 上传 ISO 镜像失败：%{message}"
 
 msgid "Full host '%s' image"
-msgstr "完整主机 '%s' 映像"
+msgstr "完整主机 '%s' 镜像"
 
 msgid "Full host image"
-msgstr "完整主机映像"
+msgstr "完整的主机镜像"
 
 msgid "Generating ISO image for %s"
-msgstr "为 %s 生成 ISO 映像"
+msgstr "为 %s 生成的 ISO 镜像"
 
 msgid "Generic Grub2 EFI image template"
-msgstr ""
+msgstr "通用 Grub2 EFI 镜像模板"
 
 msgid "Generic image"
-msgstr "原始映像"
+msgstr "通用镜像"
 
 msgid "Generic image template"
-msgstr "原始映像模板"
+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 地址。"
+msgstr "通用镜像是可重复使用的磁盘镜像，适用于在 Foreman 中注册的任何主机。它需要基本的 DHCP 和 DNS 服务才能正常工作并与服务器联系，但不需要 DHCP 保留或静态 IP 地址。"
 
 msgid "Grub2 directory"
-msgstr ""
+msgstr "Grub2 目录"
 
 msgid "Grub2 template to use for generic EFI host boot disks"
-msgstr ""
-
-msgid "Help"
-msgstr "帮助"
+msgstr "通用 EFI 主机启动磁盘使用的 Grub2 模板"
 
 msgid "Host '%s' image"
-msgstr "主机 '%s' 映像"
+msgstr "主机 '%s' 镜像"
 
 msgid "Host bootdisk does not work with static IPv6"
-msgstr ""
+msgstr "主机启动盘不适用于静态 IPv6"
 
 msgid "Host has no IPv4 or IPv6 address defined"
-msgstr ""
+msgstr "主机没有定义的 IPv4 或 IPv6 地址"
 
 msgid "Host has no domain defined"
-msgstr "没有为主机定义域"
+msgstr "主机没有定义的域"
 
 msgid "Host has no provisioning interface defined"
-msgstr "主机没有定义预配接口"
+msgstr "主机没有定义的置备接口"
 
 msgid "Host has no subnet defined"
-msgstr "没有为主机定义子网"
+msgstr "主机没有定义的子网"
 
 msgid "Host image"
-msgstr "主机映像"
+msgstr "主机镜像"
 
 msgid "Host image template"
-msgstr "主机映像模板"
+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 "主机不是构建模式，因此无法修改模板。"
+msgstr "主机没有处于构建模式，因此模板不能被处理"
+
+msgid "Host is not in build mode."
+msgstr ""
 
 msgid "ISO build failed"
 msgstr "ISO 构建失败"
@@ -156,7 +174,7 @@ msgid "ISO generation command"
 msgstr "ISO 生成命令"
 
 msgid "ISO hybrid conversion failed: %s"
-msgstr ""
+msgstr "ISO 混合转换失败：%s"
 
 msgid "ISOLINUX directory"
 msgstr "ISOLINUX 目录"
@@ -165,40 +183,43 @@ msgid "Import Puppet classes"
 msgstr "导入 Puppet 类"
 
 msgid "Import facts"
-msgstr "导入 fact"
+msgstr "匯入詳情"
 
 msgid "Installation media caching"
 msgstr "安装介质缓存"
 
 msgid "Installation media files will be cached for full host images"
-msgstr "可为完整主机映像缓存安装介质文件"
+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 "链载入后，即可从 Foreman 中配置的安装介质直接下载 OS 引导装载程序和安装程序，并可从 Foreman 中下载供应脚本（kickstart/preseed）。"
+msgstr "链式加载后，将直接从 Foreman 中配置的安装介质中下载 OS Bootloader 和安装程序，并从 Foreman 中下载预配置脚本（kickstart / preseed）。"
 
 msgid "Path to directory containing grubx64.efi and shimx64.efi"
-msgstr ""
+msgstr "包含 grubx64.efi 和 shimx64.efi 的目录的路径"
 
 msgid "Path to directory containing iPXE images"
-msgstr "包含 iPXE 映像目录的路径"
+msgstr "到包含 iPXE 镜像的目录的路径"
 
 msgid "Path to directory containing isolinux images"
-msgstr "到包含 isolinux 映像目录的路径"
+msgstr "到包含 isolinux 镜像目录的路径"
 
 msgid "Path to directory containing syslinux images"
-msgstr "到包含 syslinux 映像目录的路径"
+msgstr "包含 syslinux 镜像的目录的路径"
 
 msgid "Per-host images contain data about a particular host registered in Foreman and set up fully static networking, avoiding the requirement for DHCP.  After networking is configured, they chainload from Foreman, picking up the current OS configuration and build state from the server."
-msgstr "每台主机映像包含有关中 Foreman 中注册的具体主机的数据，并设置静态联网，避免使用 DHCP。配置联网后，主机就可以从 Foreman 进行链载入，提取当前 OS 配置，并根据服务器构建状态。"
+msgstr "每个主机镜像包含有关在 Foreman 中注册的特定主机的数据，并建立了完全静态的网络连接，从而可以不需要 DHCP。配置网络后，他们从 Foreman 进行链加载，选择当前的 OS 配置并从服务器构建状态。"
 
 msgid "Please ensure the ipxe-bootimgs package is installed."
-msgstr "请确保已安装 ipxe-bootimgs 软件包。"
+msgstr "请确保已安装了 ipxe-bootimgs 软件包。"
 
 msgid "Please ensure the isolinux/syslinux package(s) are installed."
-msgstr "请确保已安装 isolinux/syslinux 软件包。"
+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 架构的条件下即可供应主机。"
+msgstr "能建立基於 iPXE 的開機磁碟的 Foreman 外掛程式，以在不需要 PXE 設備的情況下佈建主機。"
 
 msgid "Remote action:"
 msgstr "远程操作："
@@ -207,55 +228,64 @@ msgid "SYSLINUX directory"
 msgstr "SYSLINUX 目录"
 
 msgid "Subnet '%s' generic image"
-msgstr "子网 '%s' 通用映象"
+msgstr "子网 '%s' 通用镜像"
 
 msgid "Subnet boot disks"
-msgstr "子网引导盘"
+msgstr "子网引导磁盘"
+
+msgid "Subnet generic image"
+msgstr "子网通用镜像"
 
 msgid "Subnet image"
-msgstr "子网映象"
+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 "子网映象与通用映象类似，但是通过为主机子网分配的 TFTP 智能代理服务器完成链载入。必须为该智能代理服务器启用并配置 “Templates”。"
-
-msgid "Subnet is not assigned to the host %s"
-msgstr "没有为主机 %s 分配子网"
+msgstr "子网镜像与通用镜像类似，但是链式加载是通过分配给主机子网的 TFTP 智能代理完成的。智能代理必须启用并配置了 “Templates” 模块。"
 
 msgid "TFTP feature not enabled for subnet %s"
 msgstr "没有为子网 %s 启用 TFTP 功能"
 
 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 "食用 Foreman 中配置的安装介质继续安装，并配置静态联网，具体要看如何配置 OS iPXE 模板。"
+msgstr "操作系统将继续使用 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 "该映象在那个子网中所有预配 NIC 的主机中通用。"
+msgstr "该镜像对于该子网上具有配置 NIC 的所有主机都是通用的。"
+
+msgid "This type of bootdisk is not allowed. Please contact administrator."
+msgstr "不允许使用这种类型的引导盘。请与管理员联系。"
 
 msgid "True for full, false for basic reusable image"
-msgstr "True 代表完整映像，false 代表基本可重复使用映像。"
+msgstr "True 全部，false 代表基本的可重复使用的镜像"
 
 msgid "Unable to find template specified by %s setting"
-msgstr "无法找到 %s 设置指定的模板"
+msgstr "找不到由 %s 设置指定的模板"
 
 msgid "Unable to generate disk %{kind} template: %{error}"
-msgstr ""
+msgstr "无法生成磁盘 %{kind} 模板 : %{error}"
 
 msgid "Unable to generate disk template, %{kind} template not found."
-msgstr ""
+msgstr "无法生成磁盘模板，未找到 %{kind} 模板。"
 
-msgid "Unable to mcopy %{path}"
-msgstr ""
+msgid "Unable to mcopy %{file}"
+msgstr "无法 mcopy %{file}"
 
 msgid "Upload ISO image to datastore for %s"
-msgstr "将 ISO 映像上传至 %s 的数据存储区"
+msgstr "为 %s 将 ISO 镜像上传至数据存储"
 
 msgid "Various types of boot disks can be created to provision hosts without the need for PXE services.  Boot disks can be attached to the host (physical or virtual) which boots from the disk, contacts Foreman and begins the OS installation."
-msgstr "可生成各种类型的引导磁盘在不需要 PXE 服务的情况下供应主机。可将引导磁盘附加到使用该磁盘引导的主机（物理机或虚拟机），联络 Foreman 并开始操作系统安装。"
+msgstr "可以创建不同类型的启动磁盘来置备主机，而无需 PXE 服务。引导磁盘可以附加到主机（物理或虚拟），该主机从磁盘引导，联系 Foreman 并开始进行 OS 安装。"
 
 msgid "iPXE directory"
 msgstr "iPXE 目录"
 
 msgid "iPXE template to use for generic host boot disks"
-msgstr "通用主机引导盘使用的 iPXE 模板"
+msgstr "通用主机引导磁盘使用的 iPXE 模板"
 
 msgid "iPXE template to use for host-specific boot disks"
-msgstr "具体主机引导盘使用的 iPXE 模板"
+msgstr "特定于主机的引导磁盘使用的 iPXE 模板"

data/locale/zh_TW/foreman_bootdisk.po

@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 17.0.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-04-29 10:23+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 ""
 
@@ -68,7 +77,7 @@ 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)"
+msgid "Ensure %{file} is readable (or update \"Grub2 directory\" setting)"
 msgstr ""
 
 msgid "Failed to attach ISO image to CDROM drive of instance %{name}: %{message}"
@@ -110,6 +119,9 @@ 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 位址。"
 
@@ -119,9 +131,6 @@ msgstr ""
 msgid "Grub2 template to use for generic EFI host boot disks"
 msgstr ""
 
-msgid "Help"
-msgstr "協助"
-
 msgid "Host '%s' image"
 msgstr "主機「%s」映像檔"
 
@@ -146,9 +155,18 @@ 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 失敗"
 
@@ -173,6 +191,9 @@ 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 下載。"
 
@@ -212,24 +233,33 @@ 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」則代表可重複使用的基本映像檔"
 
@@ -242,7 +272,7 @@ msgstr ""
 msgid "Unable to generate disk template, %{kind} template not found."
 msgstr ""
 
-msgid "Unable to mcopy %{path}"
+msgid "Unable to mcopy %{file}"
 msgstr ""
 
 msgid "Upload ISO image to datastore for %s"

data/test/functional/foreman_bootdisk/disks_controller_test.rb

@@ -35,16 +35,6 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
     tmp.unlink
   end
 
-  def perform_subnet_generate
-    tmp = create_tempfile
-    ForemanBootdisk::ISOGenerator.expects(:generate).yields(create_tempfile.path)
-    get :subnet, params: { id: @host.name }, 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
@@ -60,10 +50,6 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
     test 'should generate full host image' do
       perform_full_host_generate
     end
-
-    test 'should generate subnet image' do
-      perform_subnet_generate
-    end
   end
 
   describe '#subnet_host with TFTP and HTTPBOOT' do
@@ -81,10 +67,6 @@ class ForemanBootdisk::DisksControllerTest < ActionController::TestCase
     test 'should generate full host image' do
       perform_full_host_generate
     end
-
-    test 'should generate subnet image' do
-      perform_subnet_generate
-    end
   end
 
   describe '#host without tftp' do
@@ -93,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 17.1.0
+  version: 18.0.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-27 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: theforeman-rubocop
@@ -59,7 +59,12 @@ files:
 - 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
+- app/controllers/foreman_bootdisk/subnet_disks_controller.rb
+- app/helpers/bootdisk_links_helper.rb
 - app/helpers/concerns/foreman_bootdisk/hosts_helper_ext.rb
+- app/helpers/concerns/foreman_bootdisk/pretty_error.rb
+- app/helpers/concerns/foreman_bootdisk/subnets_helper_ext.rb
+- app/helpers/disk_helper.rb
 - app/lib/foreman_bootdisk/scope/bootdisk.rb
 - app/lib/foreman_bootdisk/scope/full_host_bootdisk.rb
 - app/lib/foreman_bootdisk/scope/full_host_bootdisk_efi.rb
@@ -75,6 +80,8 @@ files:
 - app/views/foreman_bootdisk/generic_static_host.erb
 - app/views/foreman_bootdisk/host.erb
 - app/views/hosts/provision_method/bootdisk/_form.html.erb
+- app/views/subnets/_bootdisk_action_buttons.erb
+- app/views/subnets/_bootdisk_title_buttons.erb
 - config/routes.rb
 - config/routes/mount_engine.rb
 - db/migrate/20130914211030_create_host_bootdisk_template.rb
@@ -126,6 +133,7 @@ files:
 - test/functional/foreman_bootdisk/api/v2/disks_controller_test.rb
 - test/functional/foreman_bootdisk/api/v2/subnet_disks_controller_test.rb
 - test/functional/foreman_bootdisk/disks_controller_test.rb
+- test/functional/foreman_bootdisk/subnet_disks_controller_test.rb
 - test/models/host/managed_test.rb
 - test/test_plugin_helper.rb
 - test/unit/access_permissions_test.rb