Skip to content

Fixes extract size for storages with no sizes like zfs #111

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.

Sign up for GitHub

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

Merged
Manisha15 merged 1 commit into from
Aug 5, 2025
Merged

Fixes extract size for storages with no sizes like zfs #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/fog/proxmox/helpers/disk_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ def self.to_int_gb(size_bytes)

def self.extract_size(disk_value)
size = extract_option('size', disk_value)
size = to_int_gb(to_bytes(size)).to_s if size.match?(/\d+(G)/)
size = to_int_gb(to_bytes(size)).to_s if size&.match?(/\d+(G)/)
size
end

Expand Down
9 changes: 8 additions & 1 deletion spec/helpers/disk_helper_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
end

let(:scsi) do
{ scsi0: 'local-lvm:vm-100-disk-1,size=8,cache=none' }
{ scsi0: 'local-lvm:vm-100-disk-1,size=8,cache=none', scsi1: 'zdata:vm-221-disk-0' }
end

let(:virtio1) do
Expand Down Expand Up @@ -118,6 +118,13 @@
assert_equal('8', size)
end

it 'returns scsi get zdata storage and volid with no size' do
storage, volid, size = Fog::Proxmox::DiskHelper.extract_storage_volid_size(scsi[:scsi1])
assert_equal('zdata', storage)
assert_equal('zdata:vm-221-disk-0', volid)
assert_nil size
end

it 'returns virtio get local storage volid and size' do
storage, volid, size = Fog::Proxmox::DiskHelper.extract_storage_volid_size(virtio[:virtio1])
assert_equal('local', storage)
Expand Down