Merge pull request #3980 from skateman/physical-quad-fix

 Restrict quadicon class demodulization for Physical* records only

app/helpers/quadicon_helper.rb

@@ -70,7 +70,7 @@ def self.settings_key(klass, layout)
       when "ems_physical_infra", "ems_cloud", "ems_network", "ems_container"
         layout.to_sym
       end
-    elsif klass.base_model.name != klass.name.demodulize
+    elsif klass.name.demodulize.starts_with?("Physical") && klass.base_model.name != klass.name.demodulize
       klass.name.demodulize.underscore.to_sym
     else
       klass.base_model.name.underscore.to_sym

spec/helpers/quadicon_helper_spec.rb

@@ -1,2 +1,24 @@
 describe QuadiconHelper do
+  describe '.settings_key' do
+    subject { described_class.settings_key(klass, layout) }
+
+    {
+      :ems                => [ManageIQ::Providers::Vmware::InfraManager, 'ems_infra'],
+      :ems_physical_infra => [ManageIQ::Providers::Lenovo::PhysicalInfraManager, 'ems_physical_infra'],
+      :ems_cloud          => [ManageIQ::Providers::Openstack::CloudManager, 'ems_cloud'],
+      :ems_network        => [ManageIQ::Providers::Amazon::NetworkManager, 'ems_network'],
+      :ems_container      => [ManageIQ::Providers::Openshift::ContainerManager, 'ems_container'],
+      :physical_switch    => [ManageIQ::Providers::Lenovo::PhysicalInfraManager::PhysicalSwitch, nil],
+      :switch             => [Switch, nil]
+    }.each do |result, input|
+      context "class is #{input.first} with #{input.last} as layout" do
+        let(:klass) { input.first }
+        let(:layout) { input.last }
+
+        it "returns with #{result}" do
+          expect(subject).to eq(result)
+        end
+      end
+    end
+  end
 end