Skip to content

Commit

Permalink
v2v: Support virtio-win drivers ISO
Browse files Browse the repository at this point in the history
In addition to {oVirt,RHEV} setup tools there can be a separate ISO containing
*only* the virtio drivers. This patch adds support to show also these kind of
ISOs since they can be used for the v2v conversion process as well.
  • Loading branch information
matobet committed Jul 18, 2017
1 parent 11d379e commit c3b3d57
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def main
values_hash[nil] = '-- no ISO datastore for provider --'
else
values_hash[nil] = '-- select drivers ISO from list --'
provider.iso_datastore.iso_images.pluck(:name).grep(/tools.*setup/i).each do |iso|
provider.iso_datastore.iso_images.pluck(:name).grep(/tools.*setup|virtio-win.*.iso$/i).each do |iso|
values_hash[iso] = iso
end
end
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
let!(:provider) { FactoryGirl.create(:ems_redhat, :with_clusters, :iso_datastore => iso_datastore) }
let!(:iso_datastore) do
iso_images = %w(
virtio-win-1.9.0.iso
virtio-win-1.9.0_amd64.vfd
RHEV-toolsSetup_3.5_15.iso
RHEV-toolsSetup_4.0_7.iso
random-image.iso
Expand Down Expand Up @@ -49,6 +51,7 @@
oVirt-toolsSetup-4.1-3.fc24.iso
oVirt-toolsSetup-4.2-4.fc25.iso
rhev-tools-setup.iso
virtio-win-1.9.0.iso
).each { |iso| isos[iso] = iso }

expect(ae_service.object['values']).to eq(isos)
Expand Down

0 comments on commit c3b3d57

Please sign in to comment.