Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement EFI host creation #134

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,7 @@ SignalException:

Metrics/ClassLength:
Enabled: false

Metrics/BlockLength:
Exclude:
- tests/**/*.rb
22 changes: 21 additions & 1 deletion lib/fog/libvirt/models/compute/server.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ class Server < Fog::Compute::Server

attribute :cpus
attribute :cputime
attribute :os_firmware
attribute :os_type
attribute :os_loader
attribute :memory_size
attribute :max_memory_size
attribute :name
Expand Down Expand Up @@ -281,10 +283,28 @@ def to_xml
end

xml.vcpu(cpus)
xml.os do

os_tags = {}

# Secure boot and stateless UEFI both imply an EFI firmware
if ["secure", "stateless"].include?(os_loader)
os_tags[:firmware] = "efi"
elsif os_firmware
os_tags[:firmware] = os_firmware
end

xml.os(**os_tags) do
type = xml.type(os_type, :arch => arch)
type[:machine] = "q35" if ["i686", "x86_64"].include?(arch)

# TODO: can you use both secure and stateless at the same time?
case attributes[:os_loader]
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self: https://libvirt.org/kbase/secureboot.html says the os_loader was only needed for libvirt >= 7.2 < 8.6

when "secure"
xml.loader(:secure => "yes")
when "stateless"
xml.loader(:stateless => "yes")
end

boot_order.each do |dev|
xml.boot(:dev => dev)
end
Expand Down
24 changes: 24 additions & 0 deletions tests/libvirt/models/compute/server_tests.rb
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
attributes = [ :id,
:cpus,
:cputime,
:os_firmware,
:os_loader,
:os_type,
:memory_size,
:max_memory_size,
Expand Down Expand Up @@ -60,6 +62,7 @@
end
test('be a kind of Fog::Libvirt::Compute::Server') { server.kind_of? Fog::Libvirt::Compute::Server }
tests("serializes to xml") do
test("without firmware") { server.to_xml.include?("<os>") }
test("with memory") { server.to_xml.match?(%r{<memory>\d+</memory>}) }
test("with disk of type file") do
xml = server.to_xml
Expand All @@ -78,6 +81,27 @@
xml.match?(/<disk type="block" device="disk">/) && xml.match?(%r{<source dev="/dev/sda"/>})
end
test("with q35 machine type on x86_64") { server.to_xml.match?(%r{<type arch="x86_64" machine="q35">hvm</type>}) }
test("with efi firmware") do
server = Fog::Libvirt::Compute::Server.new(
{
:os_firmware => "efi",
:nics => [],
:volumes => []
}
)
server.to_xml.include?('<os firmware="efi">')
end
test("with secure boot") do
server = Fog::Libvirt::Compute::Server.new(
{
:os_loader => "secure",
:nics => [],
:volumes => []
}
)
xml = server.to_xml
xml.include?('<os firmware="efi">') && xml.include?('<loader secure="yes"/>')
end
end
end
end