Merge pull request ManageIQ#169 from epwinchell/vendor_os_image_cleanup

vendor and os image cleanup

app/controllers/miq_policy_controller/alert_profiles.rb

@@ -223,7 +223,7 @@ def alert_profile_build_obj_tree
             icon = "100/tag.png"
           else
             if @assign[:new][:assign_to] == "ext_management_system"
-              icon = "100/vendor-#{o.image_name}.png"
+              icon = "svg/vendor-#{o.image_name}.svg"
             elsif @assign[:new][:assign_to] == "resource_pool"
               icon = o.vapp ? "100/vapp.png" : "100/resource_pool.png"
             else

app/helpers/application_helper.rb

@@ -1646,11 +1646,11 @@ def listicon_image_tag(db, row)
     elsif %(Vm VmOrTemplate).include?(db)
       vm = @targets_hash[from_cid(@id)]
       vendor = vm ? vm.vendor : "unknown"
-      image = "100/vendor-#{vendor}.png"
+      image = "svg/vendor-#{vendor}.svg"
     elsif db == "Host"
       host = @targets_hash[@id] if @targets_hash
       vendor = host ? host.vmm_vendor_display.downcase : "unknown"
-      image = "100/vendor-#{vendor}.png"
+      image = "svg/vendor-#{vendor}.svg"
     elsif db == "MiqAction"
       action = @targets_hash[@id.to_i]
       image = if action && action.action_type != "default"
@@ -1665,7 +1665,7 @@ def listicon_image_tag(db, row)
       image = "100/processmanager-#{worker.normalized_type}.png"
     elsif db == "ExtManagementSystem"
       ems = @targets_hash[from_cid(@id)]
-      image = "100/vendor-#{ems.image_name}.png"
+      image = "svg/vendor-#{ems.image_name}.svg"
     elsif db == "Tenant"
       image = row['divisible'] ? "100/tenant.png" : "100/project.png"
     else

lib/report_formatter/timeline.rb

@@ -102,11 +102,11 @@ def tl_event(row, col)
         when "Vm"
           e_title = rec[:name]
           e_icon = ActionController::Base.helpers.image_path("timeline/vendor-#{rec.vendor.downcase}.png")
-          e_image = ActionController::Base.helpers.image_path("100/os-#{rec.os_image_name.downcase}.png")
+          e_image = ActionController::Base.helpers.image_path("svg/os-#{rec.os_image_name.downcase}.svg")
         when "Host"
           e_title = rec[:name]
           e_icon = ActionController::Base.helpers.image_path("timeline/vendor-#{rec.vmm_vendor_display.downcase}.png")
-          e_image = ActionController::Base.helpers.image_path("100/os-#{rec.os_image_name.downcase}.png")
+          e_image = ActionController::Base.helpers.image_path("svg/os-#{rec.os_image_name.downcase}.svg")
         when "EventStream"
           ems_cloud = false
           if rec[:ems_id] && ExtManagementSystem.exists?(rec[:ems_id])
@@ -145,7 +145,7 @@ def tl_event(row, col)
             end
           end
           if rec[:vm_or_template_id] && Vm.exists?(rec[:vm_or_template_id])
-            e_image = ActionController::Base.helpers.image_path("100/os-#{Vm.find(rec[:vm_or_template_id]).os_image_name.downcase}.png")
+            e_image = ActionController::Base.helpers.image_path("svg/os-#{Vm.find(rec[:vm_or_template_id]).os_image_name.downcase}.svg")
           end
         else
           e_title = rec[:name] ? rec[:name] : row[mri.col_order.first].to_s

spec/javascripts/controllers/network/network_topology_controller_spec.js

@@ -45,8 +45,8 @@ describe('networkTopologyController', function() {
     describe('the topology gets correct icons', function() {
       it('in graph elements', function() {
         var d = { id:"2",  item:{display_kind:"Amazon", kind:"NetworkManager", id:"2"}};
-        expect($controller.getIcon(d)).toContain("/assets/100/vendor-amazon");
-        expect($controller.getIcon(network_provider)).toContain("/assets/100/vendor-openstack");
+        expect($controller.getIcon(d)).toContain("/assets/svg/vendor-amazon");
+        expect($controller.getIcon(network_provider)).toContain("/assets/svg/vendor-openstack");
         d = { id:"3",  item:{display_kind:"SecurityGroup", kind:"SecurityGroup", id:"3"}};
         expect($controller.getIcon(d)).toEqual("\uE903");
         d = { id:"4",  item:{display_kind:"VM", kind:"Vm", id:"4"}};

spec/javascripts/fixtures/json/network_topology_response.json

@@ -913,10 +913,10 @@
       "CloudNetwork": "",
       "CloudTenant": "",
       "Vm": "",
-      "Openstack": "/assets/100/vendor-openstack-101a7353730a0de56e4e0cd68bbea8e94bd8f2aa27f771659714d8b5cbe921b5.png",
-      "Amazon": "/assets/100/vendor-amazon-0a8a9819253e7a0d46fa1de433b8a8038027fe37b550525b2a355c2e4f6e823c.png",
-      "Azure": "/assets/100/vendor-azure-2e64b8e33112ccc402e499512cfbc72dd49ea9f7d367ee7ae7d372fdc0b300d6.png",
-      "Google": "/assets/100/vendor-google-37961336be6f1e0df548a3d5329a65426cc27c9d25dca7a17d3d84a696865574.png"
+      "Openstack": "/assets/svg/vendor-openstack-101a7353730a0de56e4e0cd68bbea8e94bd8f2aa27f771659714d8b5cbe921b5.svg",
+      "Amazon": "/assets/svg/vendor-amazon-0a8a9819253e7a0d46fa1de433b8a8038027fe37b550525b2a355c2e4f6e823c.svg",
+      "Azure": "/assets/svg/vendor-azure-2e64b8e33112ccc402e499512cfbc72dd49ea9f7d367ee7ae7d372fdc0b300d6.svg",
+      "Google": "/assets/svg/vendor-google-37961336be6f1e0df548a3d5329a65426cc27c9d25dca7a17d3d84a696865574.svg"
     }
   }
 }