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.

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

Jump to bottom

v2v: Support virtio-win drivers ISO #147

Merged
merged 1 commit into from
Jul 20, 2017
Merged

v2v: Support virtio-win drivers ISO #147

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 ...utomate/ManageIQ/Infrastructure/VM/Transform/Import.class/__methods__/list_driver_isos.rb
View file
Open in desktop
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
3 changes: 3 additions & 0 deletions ...te/ManageIQ/Infrastructure/VM/Transform/Import.class/__methods__/list_driver_isos_spec.rb
View file
Open in desktop
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