diff --git a/app/assets/images/100/os-esx-server-3i.png b/app/assets/images/100/os-esx-server-3i.png
deleted file mode 100644
index ebd01abe0e3..00000000000
Binary files a/app/assets/images/100/os-esx-server-3i.png and /dev/null differ
diff --git a/app/assets/images/100/os-linux_centos.png b/app/assets/images/100/os-linux_centos.png
deleted file mode 100644
index 18860d51426..00000000000
Binary files a/app/assets/images/100/os-linux_centos.png and /dev/null differ
diff --git a/app/assets/images/100/os-linux_chrome.png b/app/assets/images/100/os-linux_chrome.png
deleted file mode 100644
index eacb78abfb3..00000000000
Binary files a/app/assets/images/100/os-linux_chrome.png and /dev/null differ
diff --git a/app/assets/images/100/os-linux_chromium.png b/app/assets/images/100/os-linux_chromium.png
deleted file mode 100644
index 01ba92f77f8..00000000000
Binary files a/app/assets/images/100/os-linux_chromium.png and /dev/null differ
diff --git a/app/assets/images/100/os-linux_coreos.png b/app/assets/images/100/os-linux_coreos.png
deleted file mode 100644
index ef2b5a86e38..00000000000
Binary files a/app/assets/images/100/os-linux_coreos.png and /dev/null differ
diff --git a/app/assets/images/100/os-linux_debian.png b/app/assets/images/100/os-linux_debian.png
deleted file mode 100644
index e0fb011bfdc..00000000000
Binary files a/app/assets/images/100/os-linux_debian.png and /dev/null differ
diff --git a/app/assets/images/100/os-linux_esx.png b/app/assets/images/100/os-linux_esx.png
deleted file mode 100644
index 4bb140ffc34..00000000000
Binary files a/app/assets/images/100/os-linux_esx.png and /dev/null differ
diff --git a/app/assets/images/100/os-linux_fedora.png b/app/assets/images/100/os-linux_fedora.png
deleted file mode 100644
index 83f536f308e..00000000000
Binary files a/app/assets/images/100/os-linux_fedora.png and /dev/null differ
diff --git a/app/assets/images/100/os-linux_generic.png b/app/assets/images/100/os-linux_generic.png
deleted file mode 100644
index 6369c301c42..00000000000
Binary files a/app/assets/images/100/os-linux_generic.png and /dev/null differ
diff --git a/app/assets/images/100/os-linux_gentoo.png b/app/assets/images/100/os-linux_gentoo.png
deleted file mode 100644
index 2422a583f02..00000000000
Binary files a/app/assets/images/100/os-linux_gentoo.png and /dev/null differ
diff --git a/app/assets/images/100/os-linux_redhat.png b/app/assets/images/100/os-linux_redhat.png
deleted file mode 100644
index d6f91370a4c..00000000000
Binary files a/app/assets/images/100/os-linux_redhat.png and /dev/null differ
diff --git a/app/assets/images/100/os-linux_solaris.png b/app/assets/images/100/os-linux_solaris.png
deleted file mode 100644
index 2504f2ff21c..00000000000
Binary files a/app/assets/images/100/os-linux_solaris.png and /dev/null differ
diff --git a/app/assets/images/100/os-linux_suse.png b/app/assets/images/100/os-linux_suse.png
deleted file mode 100644
index 28da6a9f426..00000000000
Binary files a/app/assets/images/100/os-linux_suse.png and /dev/null differ
diff --git a/app/assets/images/100/os-linux_ubuntu.png b/app/assets/images/100/os-linux_ubuntu.png
deleted file mode 100644
index dcd77abbd30..00000000000
Binary files a/app/assets/images/100/os-linux_ubuntu.png and /dev/null differ
diff --git a/app/assets/images/100/os-unknown.png b/app/assets/images/100/os-unknown.png
deleted file mode 100644
index 4cd54bedfa0..00000000000
Binary files a/app/assets/images/100/os-unknown.png and /dev/null differ
diff --git a/app/assets/images/100/os-vmware-esx-server.png b/app/assets/images/100/os-vmware-esx-server.png
deleted file mode 100644
index 50355cee77d..00000000000
Binary files a/app/assets/images/100/os-vmware-esx-server.png and /dev/null differ
diff --git a/app/assets/images/100/os-windows_generic.png b/app/assets/images/100/os-windows_generic.png
deleted file mode 100644
index 81d3580a112..00000000000
Binary files a/app/assets/images/100/os-windows_generic.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-amazon.png b/app/assets/images/100/vendor-amazon.png
deleted file mode 100644
index 18454b54e05..00000000000
Binary files a/app/assets/images/100/vendor-amazon.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-ansible_tower_configuration.png b/app/assets/images/100/vendor-ansible_tower_configuration.png
deleted file mode 100644
index 0f5d21c7b7e..00000000000
Binary files a/app/assets/images/100/vendor-ansible_tower_configuration.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-azure.png b/app/assets/images/100/vendor-azure.png
deleted file mode 100644
index 92d74549e8a..00000000000
Binary files a/app/assets/images/100/vendor-azure.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-azure_network.png b/app/assets/images/100/vendor-azure_network.png
deleted file mode 100644
index 92d74549e8a..00000000000
Binary files a/app/assets/images/100/vendor-azure_network.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-brokerless.png b/app/assets/images/100/vendor-brokerless.png
deleted file mode 100644
index d6f91370a4c..00000000000
Binary files a/app/assets/images/100/vendor-brokerless.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-cinder.png b/app/assets/images/100/vendor-cinder.png
deleted file mode 100644
index d1d972cbb2c..00000000000
Binary files a/app/assets/images/100/vendor-cinder.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-citrix.png b/app/assets/images/100/vendor-citrix.png
deleted file mode 100644
index 7c05c86e91e..00000000000
Binary files a/app/assets/images/100/vendor-citrix.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-ec2.png b/app/assets/images/100/vendor-ec2.png
deleted file mode 100644
index d8c47f82b99..00000000000
Binary files a/app/assets/images/100/vendor-ec2.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-ec2_network.png b/app/assets/images/100/vendor-ec2_network.png
deleted file mode 100644
index d8c47f82b99..00000000000
Binary files a/app/assets/images/100/vendor-ec2_network.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-foreman.png b/app/assets/images/100/vendor-foreman.png
deleted file mode 100644
index 45be168b321..00000000000
Binary files a/app/assets/images/100/vendor-foreman.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-foreman_configuration.png b/app/assets/images/100/vendor-foreman_configuration.png
deleted file mode 100644
index 45be168b321..00000000000
Binary files a/app/assets/images/100/vendor-foreman_configuration.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-foreman_provisioning.png b/app/assets/images/100/vendor-foreman_provisioning.png
deleted file mode 100644
index 45be168b321..00000000000
Binary files a/app/assets/images/100/vendor-foreman_provisioning.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-gce.png b/app/assets/images/100/vendor-gce.png
deleted file mode 100644
index f1111e10f5b..00000000000
Binary files a/app/assets/images/100/vendor-gce.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-gce_network.png b/app/assets/images/100/vendor-gce_network.png
deleted file mode 100644
index f1111e10f5b..00000000000
Binary files a/app/assets/images/100/vendor-gce_network.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-google.png b/app/assets/images/100/vendor-google.png
deleted file mode 100644
index 5be69a46fc2..00000000000
Binary files a/app/assets/images/100/vendor-google.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-google_network.png b/app/assets/images/100/vendor-google_network.png
deleted file mode 100644
index 5be69a46fc2..00000000000
Binary files a/app/assets/images/100/vendor-google_network.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-hawkular.png b/app/assets/images/100/vendor-hawkular.png
deleted file mode 100644
index 92c10358033..00000000000
Binary files a/app/assets/images/100/vendor-hawkular.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-hyper-v.png b/app/assets/images/100/vendor-hyper-v.png
deleted file mode 100644
index 242390ee712..00000000000
Binary files a/app/assets/images/100/vendor-hyper-v.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-ipmi.png b/app/assets/images/100/vendor-ipmi.png
deleted file mode 100644
index f609d2e9767..00000000000
Binary files a/app/assets/images/100/vendor-ipmi.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-jboss-eap.png b/app/assets/images/100/vendor-jboss-eap.png
deleted file mode 100644
index cebf53e2efc..00000000000
Binary files a/app/assets/images/100/vendor-jboss-eap.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-kubernetes.png b/app/assets/images/100/vendor-kubernetes.png
deleted file mode 100644
index 94de20cf2d2..00000000000
Binary files a/app/assets/images/100/vendor-kubernetes.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-kvm.png b/app/assets/images/100/vendor-kvm.png
deleted file mode 100644
index ca0e087db2c..00000000000
Binary files a/app/assets/images/100/vendor-kvm.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-microsoft.png b/app/assets/images/100/vendor-microsoft.png
deleted file mode 100644
index 73cfe15b10a..00000000000
Binary files a/app/assets/images/100/vendor-microsoft.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-nuage_network.png b/app/assets/images/100/vendor-nuage_network.png
deleted file mode 100644
index 7904729b18d..00000000000
Binary files a/app/assets/images/100/vendor-nuage_network.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-openshift.png b/app/assets/images/100/vendor-openshift.png
deleted file mode 100644
index 86a5d484738..00000000000
Binary files a/app/assets/images/100/vendor-openshift.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-openshift_enterprise.png b/app/assets/images/100/vendor-openshift_enterprise.png
deleted file mode 100644
index 86a5d484738..00000000000
Binary files a/app/assets/images/100/vendor-openshift_enterprise.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-openstack.png b/app/assets/images/100/vendor-openstack.png
deleted file mode 100644
index 3549ecf96d7..00000000000
Binary files a/app/assets/images/100/vendor-openstack.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-openstack_infra.png b/app/assets/images/100/vendor-openstack_infra.png
deleted file mode 100644
index 5fb9a11b752..00000000000
Binary files a/app/assets/images/100/vendor-openstack_infra.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-openstack_network.png b/app/assets/images/100/vendor-openstack_network.png
deleted file mode 100644
index d1d972cbb2c..00000000000
Binary files a/app/assets/images/100/vendor-openstack_network.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-openstack_storage.png b/app/assets/images/100/vendor-openstack_storage.png
deleted file mode 100644
index d1d972cbb2c..00000000000
Binary files a/app/assets/images/100/vendor-openstack_storage.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-parallels.png b/app/assets/images/100/vendor-parallels.png
deleted file mode 100644
index 68ccb0fe253..00000000000
Binary files a/app/assets/images/100/vendor-parallels.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-redhat.png b/app/assets/images/100/vendor-redhat.png
deleted file mode 100644
index d6f91370a4c..00000000000
Binary files a/app/assets/images/100/vendor-redhat.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-rhevm.png b/app/assets/images/100/vendor-rhevm.png
deleted file mode 100644
index 31057e2c924..00000000000
Binary files a/app/assets/images/100/vendor-rhevm.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-satellite.png b/app/assets/images/100/vendor-satellite.png
deleted file mode 100644
index d6f91370a4c..00000000000
Binary files a/app/assets/images/100/vendor-satellite.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-satellite_configuration.png b/app/assets/images/100/vendor-satellite_configuration.png
deleted file mode 100644
index d6f91370a4c..00000000000
Binary files a/app/assets/images/100/vendor-satellite_configuration.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-satellite_provisioning.png b/app/assets/images/100/vendor-satellite_provisioning.png
deleted file mode 100644
index d6f91370a4c..00000000000
Binary files a/app/assets/images/100/vendor-satellite_provisioning.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-scvmm.png b/app/assets/images/100/vendor-scvmm.png
deleted file mode 100644
index 58c2dcdd127..00000000000
Binary files a/app/assets/images/100/vendor-scvmm.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-swift.png b/app/assets/images/100/vendor-swift.png
deleted file mode 100644
index d1d972cbb2c..00000000000
Binary files a/app/assets/images/100/vendor-swift.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-unknown.png b/app/assets/images/100/vendor-unknown.png
deleted file mode 100644
index 4cd54bedfa0..00000000000
Binary files a/app/assets/images/100/vendor-unknown.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-vmware.png b/app/assets/images/100/vendor-vmware.png
deleted file mode 100644
index 89a47311755..00000000000
Binary files a/app/assets/images/100/vendor-vmware.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-vmware_cloud.png b/app/assets/images/100/vendor-vmware_cloud.png
deleted file mode 100644
index 89a47311755..00000000000
Binary files a/app/assets/images/100/vendor-vmware_cloud.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-vmware_cloud_network.png b/app/assets/images/100/vendor-vmware_cloud_network.png
deleted file mode 100644
index 89a47311755..00000000000
Binary files a/app/assets/images/100/vendor-vmware_cloud_network.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-vmwarews.png b/app/assets/images/100/vendor-vmwarews.png
deleted file mode 100644
index 045c1f98472..00000000000
Binary files a/app/assets/images/100/vendor-vmwarews.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-wildfly.png b/app/assets/images/100/vendor-wildfly.png
deleted file mode 100644
index 7a3e1713cec..00000000000
Binary files a/app/assets/images/100/vendor-wildfly.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-xen.png b/app/assets/images/100/vendor-xen.png
deleted file mode 100644
index afa857da424..00000000000
Binary files a/app/assets/images/100/vendor-xen.png and /dev/null differ
diff --git a/app/assets/images/100/vendor-xensource.png b/app/assets/images/100/vendor-xensource.png
deleted file mode 100644
index afa857da424..00000000000
Binary files a/app/assets/images/100/vendor-xensource.png and /dev/null differ
diff --git a/app/assets/images/svg/vendor-citrix.svg b/app/assets/images/svg/vendor-citrix.svg
index 6b43c4a8b79..5d0f413f0df 100644
--- a/app/assets/images/svg/vendor-citrix.svg
+++ b/app/assets/images/svg/vendor-citrix.svg
@@ -1,13 +1,10 @@
-
-
-
+
+
+
diff --git a/app/controllers/miq_policy_controller/alert_profiles.rb b/app/controllers/miq_policy_controller/alert_profiles.rb
index c804510f38e..56343a76558 100644
--- a/app/controllers/miq_policy_controller/alert_profiles.rb
+++ b/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
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ef97084cde6..172f8ad335d 100644
--- a/app/helpers/application_helper.rb
+++ b/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
diff --git a/lib/report_formatter/timeline.rb b/lib/report_formatter/timeline.rb
index f0a42443293..32b9e0cc5a0 100644
--- a/lib/report_formatter/timeline.rb
+++ b/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
diff --git a/spec/javascripts/controllers/network/network_topology_controller_spec.js b/spec/javascripts/controllers/network/network_topology_controller_spec.js
index fa31082419e..848b143d26c 100644
--- a/spec/javascripts/controllers/network/network_topology_controller_spec.js
+++ b/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"}};
diff --git a/spec/javascripts/fixtures/json/network_topology_response.json b/spec/javascripts/fixtures/json/network_topology_response.json
index 9d739305529..5df258411c6 100644
--- a/spec/javascripts/fixtures/json/network_topology_response.json
+++ b/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"
}
}
}