Merge pull request #143 from matobet/iso-grep

v2v: Fix filtering of drivers ISO to display
ManageIQ · Jul 18, 2017 · 11d379e · 11d379e
2 parents a11afc4 + 9d77fab
commit 11d379e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...utomate/ManageIQ/Infrastructure/VM/Transform/Import.class/__methods__/list_driver_isos.rb b/...utomate/ManageIQ/Infrastructure/VM/Transform/Import.class/__methods__/list_driver_isos.rb
@@ -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(/toolsSetup/).each do |iso|
+                      provider.iso_datastore.iso_images.pluck(:name).grep(/tools.*setup/i).each do |iso|
                         values_hash[iso] = iso
                       end
                     end

diff --git a/...te/ManageIQ/Infrastructure/VM/Transform/Import.class/__methods__/list_driver_isos_spec.rb b/...te/ManageIQ/Infrastructure/VM/Transform/Import.class/__methods__/list_driver_isos_spec.rb
@@ -27,6 +27,7 @@
         oVirt-toolsSetup-4.0-1.fc24.iso
         oVirt-toolsSetup-4.1-3.fc24.iso
         another-random-image.iso
+        rhev-tools-setup.iso
         oVirt-toolsSetup-4.2-4.fc25.iso
       ).map { |iso| FactoryGirl.create(:iso_image, :name => iso) }
       FactoryGirl.create(:iso_datastore, :iso_images => iso_images)
@@ -47,6 +48,7 @@
         oVirt-toolsSetup-4.0-1.fc24.iso
         oVirt-toolsSetup-4.1-3.fc24.iso
         oVirt-toolsSetup-4.2-4.fc25.iso
+        rhev-tools-setup.iso
       ).each { |iso| isos[iso] = iso }
 
       expect(ae_service.object['values']).to eq(isos)