NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use qemu-img json output and compute virtual size #1308

Browse Source
This commit is contained in:
Richard Turc
2021-06-09 22:16:15 +02:00
parent e9f5f028a3
commit 00cd79aa35
12 changed files with 224 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spec/unit/action/create_domain_volume_spec.rb
View File

@@ -3,6 +3,8 @@ require 'support/sharedcontext'
require 'support/libvirt_context'
require 'vagrant-libvirt/action/destroy_domain'
require 'vagrant-libvirt/util/byte_number'
describe VagrantPlugins::ProviderLibvirt::Action::CreateDomainVolume do
subject { described_class.new(app, env) }
@@ -38,7 +40,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::CreateDomainVolume do
env[:box_volumes] = [
{
:name=>"test_vagrant_box_image_1.1.1_0.img",
:virtual_size=>5
:virtual_size=>ByteNumber.new(5368709120)
}
]
end
@@ -65,15 +67,15 @@ describe VagrantPlugins::ProviderLibvirt::Action::CreateDomainVolume do
env[:box_volumes] = [
{
:name=>"test_vagrant_box_image_1.1.1_0.img",
:virtual_size=>5
:virtual_size=>ByteNumber.new(5368709120)
},
{
:name=>"test_vagrant_box_image_1.1.1_1.img",
:virtual_size=>10
:virtual_size=>ByteNumber.new(10737423360)
},
{
:name=>"test_vagrant_box_image_1.1.1_2.img",
:virtual_size=>20
:virtual_size=>ByteNumber.new(21474836480)
}
]
end

2
spec/unit/action/create_domain_volume_spec/one_disk_in_storage.xml
View File

@@ -1,6 +1,6 @@
<volume>
<name>test.img</name>
<capacity unit="G">5</capacity>
<capacity unit="B">5368709120</capacity>
<target>
<format type="qcow2"></format>
<permissions>

2
spec/unit/action/create_domain_volume_spec/three_disks_in_storage_disk_0.xml
View File

@@ -1,6 +1,6 @@
<volume>
<name>test.img</name>
<capacity unit="G">5</capacity>
<capacity unit="B">5368709120</capacity>
<target>
<format type="qcow2"></format>
<permissions>

2
spec/unit/action/create_domain_volume_spec/three_disks_in_storage_disk_1.xml
View File

@@ -1,6 +1,6 @@
<volume>
<name>test_1.img</name>
<capacity unit="G">10</capacity>
<capacity unit="B">10737423360</capacity>
<target>
<format type="qcow2"></format>
<permissions>

2
spec/unit/action/create_domain_volume_spec/three_disks_in_storage_disk_2.xml
View File

@@ -1,6 +1,6 @@
<volume>
<name>test_2.img</name>
<capacity unit="G">20</capacity>
<capacity unit="B">21474836480</capacity>
<target>
<format type="qcow2"></format>
<permissions>

118
spec/unit/action/handle_box_image_spec.rb
View File

@@ -1,8 +1,11 @@
require 'spec_helper'
require 'json'
require 'support/sharedcontext'
require 'support/libvirt_context'
require 'vagrant-libvirt/action/destroy_domain'
require 'vagrant-libvirt/util/byte_number'
describe VagrantPlugins::ProviderLibvirt::Action::HandleBoxImage do
subject { described_class.new(app, env) }
@@ -15,6 +18,41 @@ describe VagrantPlugins::ProviderLibvirt::Action::HandleBoxImage do
let(:all) { double('all') }
let(:box_volume) { double('box_volume') }
let(:fog_volume) { double('fog_volume') }
let(:config) { double('config') }
qemu_json_return_5G = JSON.dump({
"virtual-size": 5368709120,
"filename": "/test/box.img",
"cluster-size": 65536,
"format": "qcow2",
"actual-size": 655360,
"dirty-flag": false
})
byte_number_5G = ByteNumber.new(5368709120)
qemu_json_return_10G = JSON.dump({
"virtual-size": 10737423360,
"filename": "/test/disk.qcow2",
"cluster-size": 65536,
"format": "qcow2",
"actual-size": 655360,
"dirty-flag": false
})
byte_number_10G = ByteNumber.new(10737423360)
qemu_json_return_20G = JSON.dump({
"virtual-size": 21474836480,
"filename": "/test/box_2.img",
"cluster-size": 65536,
"format": "qcow2",
"actual-size": 1508708352,
"dirty-flag": false
})
byte_number_20G = ByteNumber.new(21474836480)
describe '#call' do
before do
@@ -51,13 +89,53 @@ describe VagrantPlugins::ProviderLibvirt::Action::HandleBoxImage do
{
:path=>"/test/box.img",
:name=>"test_vagrant_box_image_1.1.1_box.img",
:virtual_size=>5,
:virtual_size=>byte_number_5G,
:format=>"qcow2"
}
]
)
end
context 'When config.machine_virtual_size is set and smaller than box_virtual_size' do
before do
allow(env[:machine]).to receive_message_chain("provider_config.machine_virtual_size").and_return(1)
end
it 'should warning must be raise' do
expect(ui).to receive(:warn).with("Ignoring requested virtual disk size of '1' as it is below\nthe minimum box image size of '5'.")
expect(subject.call(env)).to be_nil
expect(env[:box_volumes]).to eq(
[
{
:path=>"/test/box.img",
:name=>"test_vagrant_box_image_1.1.1_box.img",
:virtual_size=>byte_number_5G,
:format=>"qcow2"
}
]
)
end
end
context 'When config.machine_virtual_size is set and higher than box_virtual_size' do
before do
allow(env[:machine]).to receive_message_chain("provider_config.machine_virtual_size").and_return(20)
end
it 'should be use' do
expect(ui).to receive(:info).with("Created volume larger than box defaults, will require manual resizing of\nfilesystems to utilize.")
expect(subject.call(env)).to be_nil
expect(env[:box_volumes]).to eq(
[
{
:path=>"/test/box.img",
:name=>"test_vagrant_box_image_1.1.1_box.img",
:virtual_size=>byte_number_20G,
:format=>"qcow2"
}
]
)
end
end
context 'when disk image not in storage pool' do
before do
allow(File).to receive(:exist?).and_return(true)
@@ -74,7 +152,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::HandleBoxImage do
hash_including(
:name => "test_vagrant_box_image_1.1.1_box.img",
:allocation => "5120M",
:capacity => "5G",
:capacity => "5368709120B",
)
)
expect(subject).to receive(:upload_image)
@@ -122,14 +200,14 @@ describe VagrantPlugins::ProviderLibvirt::Action::HandleBoxImage do
'/test/'.concat(arg.to_s)
end
allow(status).to receive(:success?).and_return(true)
allow(Open3).to receive(:capture3).with('qemu-img', 'info', '/test/box.img').and_return([
"image: /test/box.img\nfile format: qcow2\nvirtual size: 5 GiB (5368709120 bytes)\ndisk size: 1.45 GiB\n", "", status
allow(Open3).to receive(:capture3).with('qemu-img', 'info', '--output=json', '/test/box.img').and_return([
qemu_json_return_5G, "", status
])
allow(Open3).to receive(:capture3).with('qemu-img', 'info', '/test/disk.qcow2').and_return([
"image: /test/disk.qcow2\nfile format: qcow2\nvirtual size: 10 GiB (10737418240 bytes)\ndisk size: 1.45 GiB\n", "", status
allow(Open3).to receive(:capture3).with('qemu-img', 'info', '--output=json', '/test/disk.qcow2').and_return([
qemu_json_return_10G, "", status
])
allow(Open3).to receive(:capture3).with('qemu-img', 'info', '/test/box_2.img').and_return([
"image: /test/box_2.img\nfile format: qcow2\nvirtual size: 20 GiB (21474836480 bytes)\ndisk size: 1.45 GiB\n", "", status
allow(Open3).to receive(:capture3).with('qemu-img', 'info', '--output=json', '/test/box_2.img').and_return([
qemu_json_return_20G, "", status
])
end
@@ -141,19 +219,19 @@ describe VagrantPlugins::ProviderLibvirt::Action::HandleBoxImage do
{
:path=>"/test/box.img",
:name=>"test_vagrant_box_image_1.1.1_send_box_name.img",
:virtual_size=>5,
:virtual_size=>byte_number_5G,
:format=>"qcow2"
},
{
:path=>"/test/disk.qcow2",
:name=>"test_vagrant_box_image_1.1.1_disk.img",
:virtual_size=>10,
:virtual_size=>byte_number_10G,
:format=>"qcow2"
},
{
:path=>"/test/box_2.img",
:name=>"test_vagrant_box_image_1.1.1_box_2.img",
:virtual_size=>20,
:virtual_size=>byte_number_20G,
:format=>"qcow2"
}
]
@@ -176,7 +254,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::HandleBoxImage do
hash_including(
:name => "test_vagrant_box_image_1.1.1_send_box_name.img",
:allocation => "5120M",
:capacity => "5G",
:capacity => "5368709120B",
)
)
expect(subject).to receive(:upload_image)
@@ -186,7 +264,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::HandleBoxImage do
hash_including(
:name => "test_vagrant_box_image_1.1.1_disk.img",
:allocation => "10240M",
:capacity => "10G",
:capacity => "10737423360B",
)
)
expect(subject).to receive(:upload_image)
@@ -196,7 +274,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::HandleBoxImage do
hash_including(
:name => "test_vagrant_box_image_1.1.1_box_2.img",
:allocation => "20480M",
:capacity => "20G",
:capacity => "21474836480B",
)
)
expect(subject).to receive(:upload_image)
@@ -279,14 +357,14 @@ describe VagrantPlugins::ProviderLibvirt::Action::HandleBoxImage do
'/test/'.concat(arg.to_s)
end
allow(status).to receive(:success?).and_return(true)
allow(Open3).to receive(:capture3).with('qemu-img', 'info', '/test/box.img').and_return([
"image: /test/box.img\nfile format: qcow2\nvirtual size: 5 GiB (5368709120 bytes)\ndisk size: 1.45 GiB\n", "", status
allow(Open3).to receive(:capture3).with('qemu-img', 'info', "--output=json", '/test/box.img').and_return([
qemu_json_return_5G, "", status
])
allow(Open3).to receive(:capture3).with('qemu-img', 'info', '/test/disk.qcow2').and_return([
"image: /test/disk.qcow2\nfile format: qcow2\nvirtual size: 10 GiB (10737418240 bytes)\ndisk size: 1.45 GiB\n", "", status
allow(Open3).to receive(:capture3).with('qemu-img', 'info', "--output=json", '/test/disk.qcow2').and_return([
qemu_json_return_10G, "", status
])
allow(Open3).to receive(:capture3).with('qemu-img', 'info', '/test/box_2.img').and_return([
"image: /test/box_2.img\nfile format: qcow2\nvirtual size: 20 GiB (21474836480 bytes)\ndisk size: 1.45 GiB\n", "", status
allow(Open3).to receive(:capture3).with('qemu-img', 'info', "--output=json", '/test/box_2.img').and_return([
qemu_json_return_20G, "", status
])
end

26
spec/unit/util/byte_number_spec.rb Normal file
View File

@@ -0,0 +1,26 @@
require 'spec_helper'
require 'vagrant-libvirt/util/byte_number'
describe ByteNumber do
describe '#ByteNumber to Gigrabyte' do
it 'should return bigger size' do
expect( ByteNumber.new("10737423360").to_GB).to eq(11)
expect( ByteNumber.new("737423360").to_GB).to eq(1)
expect( ByteNumber.new("110737423360").to_GB).to eq(104)
end
end
describe '#ByteNumber from Gigrabyte' do
it 'should convert' do
expect( ByteNumber.from_GB(5).to_i).to eq(5368709120)
end
end
describe '#ByteNumber pow' do
it 'should be work like interger' do
expect( ByteNumber.new(5).pow(5).to_i).to eq(5**5)
end
end
end