Refs #36833 - New PXE loader "Grub2 UEFI SecureBoot (target OS)"

theforeman · Mar 1, 2024 · a1d337d · a1d337d
1 parent 1298680
commit a1d337d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/test/tftp/integration_test.rb b/test/tftp/integration_test.rb
@@ -14,7 +14,7 @@ def test_features
     mod = response['tftp']
     refute_nil(mod)
     assert_equal('running', mod['state'], Proxy::LogBuffer::Buffer.instance.info[:failed_modules][:tftp])
-    assert_equal(["secure_boot_target_os_bootloader"], mod['capabilities'])
+    assert_equal(["target_os_bootloader_support"], mod['capabilities'])
 
     expected_settings = { 'tftp_servername' => 'tftp.example.com' }
     assert_equal(expected_settings, mod['settings'])

diff --git a/test/tftp/tftp_api_test.rb b/test/tftp/tftp_api_test.rb
@@ -40,11 +40,6 @@ def test_instantiate_pxegrub2
     assert_equal "Proxy::TFTP::Pxegrub2", obj.class.name
   end
 
-  def test_instantiate_pxegrub2targetos
-    obj = app.helpers.instantiate "pxegrub2targetos", "AA:BB:CC:DD:EE:FF"
-    assert_equal "Proxy::TFTP::Pxegrub2targetos", obj.class.name
-  end
-
   def test_instantiate_ztp
     obj = app.helpers.instantiate "ztp", "AA:BB:CC:DD:EE:FF"
     assert_equal "Proxy::TFTP::Ztp", obj.class.name

diff --git a/test/tftp/tftp_server_test.rb b/test/tftp/tftp_server_test.rb
@@ -113,24 +113,14 @@ class TftpPxegrub2ServerTest < Test::Unit::TestCase
 
   def setup_paths
     @subject = Proxy::TFTP::Pxegrub2.new
-    @pxe_config_files = ["grub2/grub.cfg-01-aa-bb-cc-dd-ee-ff", "grub2/grub.cfg-aa:bb:cc:dd:ee:ff"]
-    @pxe_default_files = ["grub2/grub.cfg"]
-  end
-end
-
-class TftpPxegrub2targetosServerTest < Test::Unit::TestCase
-  include TftpGenericServerSuite
-
-  def setup_paths
-    @subject = Proxy::TFTP::Pxegrub2targetos.new
     @pxe_config_files = [
-      "grub2/aa-bb-cc-dd-ee-ff/grub.cfg",
-      "grub2/aa-bb-cc-dd-ee-ff/grub.cfg-01-aa-bb-cc-dd-ee-ff",
-      "grub2/aa-bb-cc-dd-ee-ff/grub.cfg-aa:bb:cc:dd:ee:ff",
+      "host_config/aa-bb-cc-dd-ee-ff/grub2/grub.cfg",
+      "host_config/aa-bb-cc-dd-ee-ff/grub2/grub.cfg-01-aa-bb-cc-dd-ee-ff",
+      "host_config/aa-bb-cc-dd-ee-ff/grub2/grub.cfg-aa:bb:cc:dd:ee:ff",
       "grub2/grub.cfg-01-aa-bb-cc-dd-ee-ff",
       "grub2/grub.cfg-aa:bb:cc:dd:ee:ff",
     ]
-    @pxe_default_files = []
+    @pxe_default_files = ["grub2/grub.cfg"]
   end
 end